Merge lp:~bregma/geis/lp-825359 into lp:geis

[Stephen M. Webb]

Fix prevents the improper deallocation of resources on failure to establish a connection with the X server in the XCB back end.

Fixes bug lp:825359.

[Jussi Pakkanen (jpakkane)]

Looks ok.

review: Approve

[Chase Douglas (chasedouglas)]

+1

review: Approve

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-08-02 15:21:54 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-08-16 13:50:16 +0000
@@ -264,10 +264,10 @@
 }
 
 
-static int
+static GeisBoolean
 _verify_xcb_version(xcb_connection_t *xcb_connection)
 {
-  int                                 is_valid_version = 0;
+  GeisBoolean                         is_valid_version = GEIS_FALSE;
   xcb_gesture_query_version_cookie_t  version_cookie;
   xcb_gesture_query_version_reply_t  *version_reply = NULL;
   xcb_generic_error_t                *error = NULL;
@@ -292,7 +292,7 @@
   }
   else
   {
-    is_valid_version = 1;
+    is_valid_version = GEIS_TRUE;
   }
 
  free(version_reply);
@@ -632,17 +632,20 @@
   if (!be->x11_display)
   {
     geis_error("error opening X server.");
-    goto unwind_be;
+    geis_error_push(geis, GEIS_STATUS_UNKNOWN_ERROR);
+    goto final_exit;
   }
 
   be->xcb_connection = XGetXCBConnection(be->x11_display);
   if (!be->xcb_connection)
   {
     geis_error("error connecting to X server.");
+    geis_error_push(geis, GEIS_STATUS_UNKNOWN_ERROR);
     goto unwind_x11;
   }
   if (!_verify_xcb_version(be->xcb_connection))
   {
+    geis_error_push(geis, GEIS_STATUS_UNKNOWN_ERROR);
     goto unwind_x11;
   }
 
@@ -666,8 +669,6 @@
    * connection dangling. */
   if (!be->xcb_connection || !xcb_connection_has_error(be->xcb_connection))
     XCloseDisplay(be->x11_display);
-unwind_be:
-  free(be);
 final_exit:
   return;
 }
 
=== modified file 'libutouch-geis/geis_backend.c'
--- libutouch-geis/geis_backend.c	2011-06-29 14:40:25 +0000
+++ libutouch-geis/geis_backend.c	2011-08-16 13:50:16 +0000
@@ -132,7 +132,13 @@
       {
         *(GeisBackendClass *)(backend) = &_be_registry.be[i];
         _be_registry.be[i].vtbl->construct(_data_from_be(backend), geis);
+        if (geis_error_count(geis))
+        {
+          free(backend);
+          backend = NULL;
+        }
       }
+      break;
     }
   }
   return backend;
 
=== modified file 'libutouch-geis/geis_gesture_flick.c'
--- libutouch-geis/geis_gesture_flick.c	2011-07-01 13:02:58 +0000
+++ libutouch-geis/geis_gesture_flick.c	2011-08-16 13:50:16 +0000
@@ -243,7 +243,10 @@
 void
 geis_gesture_flick_delete(GeisGestureFlick flick)
 {
-  geis_gesture_class_unref(flick->flick_class);
-  free(flick);
+  if (flick)
+  {
+    geis_gesture_class_unref(flick->flick_class);
+    free(flick);
+  }
 }