Changeset d07af84 for keybinding.c

Timestamp:

Mar 24, 2011, 4:10:28 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

47e0a6a

Parents:

45e2c95

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 10:24:36)

git-committer:

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

Message:

Clean up owl_keypress_tostring to return a newly-allocated string

I don't think it's possible to overflow the function's internal buffer,
but we may as well avoid this sketchiness.

File:

• keybinding.c (modified) (1 diff)

keybinding.c

@@ -88 +88 @@
 {
   GString *string;
-  char keypress[64];  /* TODO: don't hard-code a value here. */
   int  i;
 
   string = g_string_new("");
   for (i = 0; i < len; i++) {
-    owl_keypress_tostring(j[i], 0, keypress, sizeof(keypress));
-    g_string_append(string, keypress);
+    char *keypress = owl_keypress_tostring(j[i], 0);
+    g_string_append(string, keypress ? keypress : "INVALID");
+    g_free(keypress);
     if (i < len - 1) g_string_append_c(string, ' ');
   }