diff options
Diffstat (limited to 'dbus/dbus-marshal.c')
| -rw-r--r-- | dbus/dbus-marshal.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c index efdc7efb..a31e0f49 100644 --- a/dbus/dbus-marshal.c +++ b/dbus/dbus-marshal.c @@ -875,6 +875,9 @@ _dbus_marshal_get_arg_end_pos (const DBusString *str, return FALSE; break; + case DBUS_TYPE_NIL: + *end_pos = pos + 1; + case DBUS_TYPE_INT32: *end_pos = _DBUS_ALIGN_VALUE (pos + 1, sizeof (dbus_int32_t)) + sizeof (dbus_int32_t); @@ -989,6 +992,7 @@ _dbus_marshal_get_arg_end_pos (const DBusString *str, * @param str the string * @param byte_order the byte order * @param pos the unaligned string position (snap to next aligned) + * @param new_pos return location for new position. */ static int demarshal_and_validate_len (const DBusString *str, @@ -1095,6 +1099,10 @@ _dbus_marshal_validate_arg (const DBusString *str, case DBUS_TYPE_INVALID: return FALSE; break; + + case DBUS_TYPE_NIL: + *end_pos = pos + 1; + break; case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: |