[E-devel] [PATCH] e_dbus HAL segfaults on early error in cb

[Joel Klinghed]

Hi.

This little trivial patch stops e_dbus HAL from segfaulting when the
E_HAL_HANDLE_ERROR() trigger in callbacks.

/Joel Klinghed


Index: e_dbus/src/lib/hal/e_hal_manager.c
===================================================================
RCS file: /var/cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_manager.c,v
retrieving revision 1.6
diff -u -p -r1.6 e_hal_manager.c
--- e_dbus/src/lib/hal/e_hal_manager.c  3 Jul 2007 15:29:24 -0000       1.6
+++ e_dbus/src/lib/hal/e_hal_manager.c  10 Jul 2007 20:10:12 -0000
@@ -16,7 +16,7 @@ static void 
 cb_manager_get_all_devices(void *data, DBusMessage *msg, DBusError *err)
 {
   E_Hal_Callback *cb = data;
-  E_Hal_Manager_Get_All_Devices_Return *ret;
+  E_Hal_Manager_Get_All_Devices_Return *ret = NULL;
   DBusMessageIter iter, sub;
 
   if (!cb) return;
@@ -76,7 +76,7 @@ static void 
 cb_manager_device_exists(void *data, DBusMessage *msg, DBusError *err)
 {
   E_Hal_Callback *cb = data;
-  E_Hal_Manager_Device_Exists_Return *ret;
+  E_Hal_Manager_Device_Exists_Return *ret = NULL;
   dbus_bool_t val;
 
   if (!cb) return;
@@ -124,7 +124,7 @@ static void 
 cb_manager_find_device_string_match(void *data, DBusMessage *msg, DBusError 
*err)
 {
   E_Hal_Callback *cb = data;
-  E_Hal_Manager_Find_Device_String_Match_Return *ret;
+  E_Hal_Manager_Find_Device_String_Match_Return *ret = NULL;
   DBusMessageIter iter, sub;
 
   if (!cb) return;
@@ -182,7 +182,7 @@ static void 
 cb_manager_find_device_by_capability(void *data, DBusMessage *msg, DBusError 
*err)
 {
   E_Hal_Callback *cb = data;
-  E_Hal_Manager_Find_Device_By_Capability_Return *ret;
+  E_Hal_Manager_Find_Device_By_Capability_Return *ret = NULL;
   DBusMessageIter iter, sub;
 
   if (!cb) return;

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel