Changeset d07af84

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.

Files:

• keybinding.c (modified) (1 diff)
• keypress.c (modified) (2 diffs)

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, ' ');
   }

keypress.c

@@ -129 +129 @@
 /* OWL_META is definied in owl.h */
 
-/* returns 0 on success */
-int owl_keypress_tostring(int j, int esc, char *buff, int bufflen)
+char *owl_keypress_tostring(int j, int esc)
 {
-  char kb[64], kb2[2];
+  GString *kb;
   const struct _owl_keypress_specialmap *sm;
 
-  *kb = '\0';
+  kb = g_string_new("");
   for (sm = specialmap; sm->kj!=0; sm++) {
     if (j == OWL_META(sm->kj) || (esc && j == sm->kj)) {
-      strcat(kb, "M-");
-      strcat(kb, sm->ks);
+      g_string_append(kb, "M-");
+      g_string_append(kb, sm->ks);
       break;
     } else if (j == sm->kj) {
-      strcat(kb, sm->ks);
+      g_string_append(kb, sm->ks);
       break;
     }
   }
-  if (!*kb) {
+  if (!kb->str[0]) {
     if (j & OWL_META(0)) {
-      strcat(kb, "M-");
+      g_string_append(kb, "M-");
       j &= ~OWL_META(0);
     }
     if ((OWL_CTRL(j) == j)) {
-      strcat(kb, "C-");
+      g_string_append(kb, "C-");
       j |= 0x40;
       if (isupper(j)) j = tolower(j);
@@ -158 +157 @@
     }
     if (isascii(j)) {
-      kb2[0] = j;
-      kb2[1] = 0;
-      strcat(kb, kb2);    
+      g_string_append_c(kb, j);
     }
     
   }  
-  if (!*kb) {
+  if (!kb->str[0]) {
     /* not a valid key */
-    strncpy(buff, "INVALID", bufflen);
-    return(-1);
-  }
-  strncpy(buff, kb, bufflen);
-  return(0);
+    g_string_free(kb, true);
+    return NULL;
+  }
+  return g_string_free(kb, false);
 }