Changeset 45e2c95 for keymap.c

Timestamp:

Mar 24, 2011, 4:09:22 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

d07af84

Parents:

b13daa0

git-author:

David Benjamin <davidben@mit.edu> (03/10/11 15:45:00)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:09:22)

Message:

Don't pass limited buffer lengths to owl_keybinding_tostring

The keymap tostring code still probably should be cleaned up though.

File:

• keymap.c (modified) (2 diffs)

keymap.c

@@ -144 +144 @@
   nbindings = owl_list_get_size(&km->bindings);
   for (i=0; i<nbindings; i++) {
-    char buff[100];
+    char *kbstr;
     const owl_cmd *cmd;
     const char *tmpdesc, *desc = "";
 
     kb = owl_list_get_element(&km->bindings, i);
-    owl_keybinding_tostring(kb, buff, 100);
+    kbstr = owl_keybinding_tostring(kb);
     owl_fmtext_append_normal(fm, OWL_TABSTR);
-    owl_fmtext_append_normal(fm, buff);
-    owl_fmtext_append_spaces(fm, 11-strlen(buff));
+    owl_fmtext_append_normal(fm, kbstr);
+    owl_fmtext_append_spaces(fm, 11-strlen(kbstr));
+    g_free(kbstr);
     owl_fmtext_append_normal(fm, " - ");
     if (kb->desc && *kb->desc) {
@@ -313 +314 @@
 void owl_keyhandler_invalidkey(owl_keyhandler *kh)
 {
-    char kbbuff[500];
-    owl_keybinding_stack_tostring(kh->kpstack, kh->kpstackpos+1, kbbuff, 500);
+    char *kbbuff = owl_keybinding_stack_tostring(kh->kpstack, kh->kpstackpos+1);
     owl_function_makemsg("'%s' is not a valid key in this context.", kbbuff);
+    g_free(kbbuff);
     owl_keyhandler_reset(kh);
 }