dbus/glib dbus-gvalue.c,1.26,1.27

[Robert McQueen]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv3873/glib

Modified Files:
	dbus-gvalue.c 
Log Message:
2006-02-16  Robert McQueen  <robot101 at debian.org>

	* dbus/dbus-message.c (dbus_message_iter_get_fixed_array):
	Patch from Rob Taylor <rob.taylor at collabora.co.uk> to correct a bogus
	assertion that the next element to read from the iter is fixed in
	size. This is not the case when you are at the end of the iter,
	because the next element type is INVALID.

	* dbus/dbus-string.c (_dbus_string_init_const_len): Correct a
	a bogus assert which means that you may not initialise a 0-length
	string unless you provide a non-NULL pointer. This prevented
	you from marshalling messages containing zero-length arrays in
	some cases.

	* glib/dbus-gvalue.c (demarshal_collection_array): Another patch
	from Rob to correct bogus asserts when trying to demarshal an
	array and get_fixed_array got you 0 elements. Append nothing to
	the GArray in this case.

	* test/glib/test-dbus-glib.c: Add a test case for round-tripping
	an empty array via the glib bindings. Without all of the above
	patches, this new test fails.

Index: dbus-gvalue.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dbus-gvalue.c	13 Feb 2006 22:30:11 -0000	1.26
+++ dbus-gvalue.c	16 Feb 2006 00:43:41 -0000	1.27
@@ -1081,9 +1081,10 @@
   dbus_message_iter_get_fixed_array (&subiter,
 				     &msgarray,
 				     &msgarray_len);
-  g_assert (msgarray != NULL);
-  g_assert (msgarray_len >= 0);
-  g_array_append_vals (ret, msgarray, (guint) msgarray_len);
+  g_assert (msgarray != NULL || msgarray_len == 0);
+
+  if (msgarray_len)
+    g_array_append_vals (ret, msgarray, (guint) msgarray_len);
 
   g_value_set_boxed_take_ownership (value, ret);