Changeset 1255 for trunk/xdotool

Timestamp:

03/31/09 12:38:54 (17 months ago)

Author:

dkg

Message:

xdotool: upgrading to 20090330

Location:

trunk/xdotool

Files:

• CHANGELIST (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• xdo.c (modified) (5 diffs)

trunk/xdotool/CHANGELIST

@@ +1 @@
+20090330:
+  * Fix bug where we use the wrong type in sizeof() for allocating character
+    code map.
+  * Fix tiny problem where we would try to free() an invalid pointer
+
 20090126:
   * Change the default behavior of 'getwindowfocus' to get the first

trunk/xdotool/debian/changelog

@@ +1 @@
+xdotool (20090330-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 31 Mar 2009 12:34:58 -0400
+
 xdotool (20090126-1) unstable; urgency=low
 

trunk/xdotool/xdo.c

@@ -1 +1 @@
 /* xdo library
  *
- * $Id: xdo.c 2158 2009-01-26 11:05:03Z jordansissel $
+ * $Id: xdo.c 2172 2009-03-30 02:38:06Z jordansissel $
  *
  * - getwindowfocus contributed by Lee Pumphret
@@ -603 +603 @@
   }
 
-  free(keys);
+  if (keys != NULL) {
+    free(keys);
+  }
   XFlush(xdo->xdpy);
   return ret;
@@ -798 +800 @@
   char *tokctx = NULL;
   const char *tok = NULL;
-  char *strptr = NULL;
+  char *keyseq_copy = NULL, *strptr = NULL;
   int i;
   KeyCode shift_keycode;
@@ -813 +815 @@
   shift_keycode = XKeysymToKeycode(xdo->xdpy, XStringToKeysym("Shift_L"));
 
-  *keys = malloc(keys_size * sizeof(KeyCode));
-  strptr = strdup(keyseq);
+  *keys = malloc(keys_size * sizeof(charcodemap_t));
+  keyseq_copy = strptr = strdup(keyseq);
   while ((tok = strtok_r(strptr, "+", &tokctx)) != NULL) {
     KeySym sym;
@@ -854 +856 @@
   }
 
-  free(strptr);
+  free(keyseq_copy);
 
   return True;