ayatana-commits team mailing list archive

["Neil J. Patel" <neil.patel@xxxxxxxxxxxxx>]

Neil J. Patel has proposed merging lp:~indicator-applet-developers/indicator-appmenu/one-more-xerror-fix into lp:indicator-appmenu.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Some uninitialized pointer fun.
-- 
https://code.launchpad.net/~indicator-applet-developers/indicator-appmenu/one-more-xerror-fix/+merge/36149
Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.

=== modified file 'src/gdk-get-func.c'
--- src/gdk-get-func.c	2010-09-20 19:31:27 +0000
+++ src/gdk-get-func.c	2010-09-21 14:12:45 +0000
@@ -84,11 +84,12 @@
 {
   GdkDisplay *display;
   Atom hints_atom = None;
-  guchar *data;
+  guchar *data = NULL;
   Atom type;
   gint format;
   gulong nitems;
   gulong bytes_after;
+  int ret = 0;
   
   display = gdk_display_get_default ();
   
@@ -100,7 +101,11 @@
 		      False, AnyPropertyType, &type, &format, &nitems,
 		      &bytes_after, &data);
   gdk_flush ();
-  gdk_error_trap_pop ();
+  if ((ret = gdk_error_trap_pop ()))
+    {
+      g_warning ("%s: Unable to get hints for %u: Error Code: %d", G_STRFUNC, (guint32)window, ret);
+      return NULL;
+    }
 
   if (type == None)
     return NULL;