Attachment 7096 Details for Bug 8350 – dbus-glib-heefre-20060920.diff

[patch] dbus-glib-heefre-20060920.diff

dbus-glib-heefre-20060920.diff (text/plain), 3.46 KB, created by frederic heem on 2006-09-20 06:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: frederic heem

Created: 2006-09-20 06:06:01 UTC

Size: 3.46 KB

patch

obsolete

>diff -ru dbus-glib-0.71-orig/dbus/dbus-gmain.c dbus-glib-0.71-heefre/dbus/dbus-gmain.c
>--- dbus-glib-0.71-orig/dbus/dbus-gmain.c	2006-07-17 19:00:39.000000000 +0200
>+++ dbus-glib-0.71-heefre/dbus/dbus-gmain.c	2006-09-20 14:53:32.000000000 +0200
>@@ -699,7 +699,7 @@
> /**
>  * Returns a connection to the given address.
>  *
>- * (Internally, calls dbus_connection_open() then calls
>+ * (Internally, calls dbus_connection_open(), dbus_bus_register() and then calls
>  * dbus_connection_setup_with_g_main() on the result.)
>  *
>  * @param address address of the connection to open
>@@ -727,6 +727,15 @@
>       return NULL;
>     }
> 
>+  if (!dbus_bus_register(connection, &derror))
>+    {
>+      dbus_connection_close (connection);
>+      dbus_connection_unref (connection);
>+      dbus_set_g_error (error, &derror);
>+      dbus_error_free (&derror);
>+      return NULL;
>+    }
>+  
>   /* does nothing if it's already been done */
>   dbus_connection_setup_with_g_main (connection, NULL);
> 
>diff -ru dbus-glib-0.71-orig/dbus/dbus-gobject.c dbus-glib-0.71-heefre/dbus/dbus-gobject.c
>--- dbus-glib-0.71-orig/dbus/dbus-gobject.c	2006-07-17 19:00:39.000000000 +0200
>+++ dbus-glib-0.71-heefre/dbus/dbus-gobject.c	2006-09-20 14:55:20.000000000 +0200
>@@ -56,7 +56,11 @@
>   const char *p;
>   GString *str;
>   gboolean last_was_uscore;
>-
>+  
>+  if(uscore == NULL){
>+    return NULL;
>+  }
>+  
>   last_was_uscore = TRUE;
>   
>   str = g_string_new (NULL);
>@@ -840,8 +844,10 @@
>       dbus_error_name = g_string_new ("org.freedesktop.DBus.GLib.UnmappedError.");
> 
>       domain_from_quark = uscore_to_wincaps (g_quark_to_string (domain));
>-      g_string_append (dbus_error_name, domain_from_quark);
>-      g_free (domain_from_quark);
>+      if(domain_from_quark){
>+        g_string_append (dbus_error_name, domain_from_quark);
>+        g_free (domain_from_quark);
>+      }
> 	
>       g_string_append_printf (dbus_error_name, ".Code%d", code);
>     }
>@@ -885,6 +891,7 @@
> 	  reply = dbus_message_new_error (message, error_name, error->message);
> 	  g_free (error_name); 
> 	}
>+    g_error_free (error);
>     }
>   return reply;
> }
>@@ -1951,6 +1958,11 @@
>   GArray *argsig;
>   guint i;
> 
>+  g_return_if_fail(context);
>+  g_return_if_fail(context->object);
>+  g_return_if_fail(context->connection);
>+  g_return_if_fail(context->message);
>+  
>   reply = dbus_message_new_method_return (dbus_g_message_get_message (context->message));
>   out_sig = method_output_signature_from_object_info (context->object, context->method);
>   argsig = _dbus_gtypes_from_arg_signature (out_sig, FALSE);
>@@ -1989,15 +2001,26 @@
>  * This function also frees the sending context.
>  *
>  * @param context the method context
>- * @param error the error to send.
>+ * @param error the error to send, the error is freed 
>  */
> void
> dbus_g_method_return_error (DBusGMethodInvocation *context, GError *error)
> {
>   DBusMessage *reply;
>+  g_return_if_fail(context);
>+  g_return_if_fail(context->object);
>+  g_return_if_fail(context->connection);
>+  g_return_if_fail(context->message);
>+  g_return_if_fail(error);
>+  
>   reply = gerror_to_dbus_error_message (context->object, dbus_g_message_get_message (context->message), error);
>-  dbus_connection_send (dbus_g_connection_get_connection (context->connection), reply, NULL);
>-  dbus_message_unref (reply);
>+  if(reply){
>+    dbus_connection_send (dbus_g_connection_get_connection (context->connection), reply, NULL);
>+    dbus_message_unref (reply);
>+  } else {
>+    g_error("dbus_g_method_return_error: cannot build reply");
>+  }
>+
>   g_free (context);
> }
>

Actions: View | Splinter Review

Attachments on bug 8350: 7096

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.