dbus/bus bus.c,1.50,1.51
Olivier Andrieu
oandrieu at pdx.freedesktop.org
Thu Apr 22 07:29:09 EST 2004
Update of /cvs/dbus/dbus/bus
In directory pdx:/tmp/cvs-serv23716/bus
Modified Files:
bus.c
Log Message:
* dbus/dbus-message.c (decode_header_data, decode_string_field):
fix incorrect setting of .name_offset in the HeaderField (it was
off by two bytes, positioned right after the name and typecode)
* bus/bus.c (bus_context_new, bus_context_unref): test before
calling dbus_server_free_data_slot and _dbus_user_database_unref
in case of an error.
* tools/Makefile.am: add $(DBUS_GLIB_TOOL_LIBS), xml libs needed
by libdbus-gtool.
Index: bus.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- a/bus.c 16 Apr 2004 15:01:25 -0000 1.50
+++ b/bus.c 21 Apr 2004 21:29:07 -0000 1.51
@@ -753,7 +753,8 @@
if (context != NULL)
bus_context_unref (context);
- dbus_server_free_data_slot (&server_data_slot);
+ if (server_data_slot >= 0)
+ dbus_server_free_data_slot (&server_data_slot);
return NULL;
}
@@ -890,7 +891,8 @@
dbus_free (context->pidfile);
}
- _dbus_user_database_unref (context->user_database);
+ if (context->user_database != NULL)
+ _dbus_user_database_unref (context->user_database);
dbus_free (context);
More information about the dbus-commit
mailing list