summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal.c
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-02-21 20:51:34 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-02-21 20:51:34 +0000
commit92f7d50b3b420670732a55bf15f7b343b2ce9fe6 (patch)
tree9ebb3ff7f3ae264be54b6336cbf1ae192340d7dc /dbus/dbus-marshal.c
parentfdb3ecc33366edc475e684baa8adb3c933563f0d (diff)
2003-02-21 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-marshal.c: (_dbus_demarshal_string_array): Make string arrays NULL-terminated. * dbus/dbus-memory.c: (dbus_free_string_array): * dbus/dbus-memory.h: New function for freeing NULL-terminated string arrays. * dbus/dbus-message-builder.c: (append_quoted_string), (_dbus_message_data_load): Add support for array types. * dbus/dbus-message.c: (check_message_handling): Add more types as test cases. * dbus/dbus-sysdeps.c: (_dbus_string_parse_int), (_dbus_string_parse_double): Add the start offset to the end offset. * test/data/valid-messages/lots-of-arguments.message: New test message with lots of arguments.
Diffstat (limited to 'dbus/dbus-marshal.c')
-rw-r--r--dbus/dbus-marshal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c
index 37128a28..f32daef0 100644
--- a/dbus/dbus-marshal.c
+++ b/dbus/dbus-marshal.c
@@ -813,11 +813,13 @@ _dbus_demarshal_string_array (const DBusString *str,
len = _dbus_demarshal_uint32 (str, byte_order, pos, &pos);
- retval = dbus_new (char *, len);
+ retval = dbus_new (char *, len + 1);
if (!retval)
return NULL;
+ retval[len] = NULL;
+
for (i = 0; i < len; i++)
{
retval[i] = _dbus_demarshal_string (str, byte_order, pos, &pos);