diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-08 19:21:13 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-08 19:21:13 +0000 |
commit | 01c3422731ce8ce19aea5380a5f276dee6e47ce4 (patch) | |
tree | b2b48846026b5863c1e0c08fa9c66fe0fad63a21 | |
parent | 3be74413ae3a30d8adb90083a559db0cfb339c79 (diff) | |
parent | b065413b0e9684fc991bf528fa6ab7175bb04888 (diff) |
Merge branch 'dbus-1.10'
-rw-r--r-- | dbus/dbus-marshal-validate-util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c index 2880a4d9..e11e1ace 100644 --- a/dbus/dbus-marshal-validate-util.c +++ b/dbus/dbus-marshal-validate-util.c @@ -61,8 +61,6 @@ run_validity_tests (const ValidityTest *tests, v, tests[i].data); _dbus_assert_not_reached ("test failed"); } - - ++i; } } @@ -83,7 +81,7 @@ static const ValidityTest signature_tests[] = { DBUS_INVALID_EXCEEDED_MAXIMUM_STRUCT_RECURSION }, { ")", DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED }, { "i)", DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED }, - { "a)", DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED }, + { "a)", DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE }, { "(", DBUS_INVALID_STRUCT_STARTED_BUT_NOT_ENDED }, { "(i", DBUS_INVALID_STRUCT_STARTED_BUT_NOT_ENDED }, { "(iiiii", DBUS_INVALID_STRUCT_STARTED_BUT_NOT_ENDED }, |