diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-08 19:21:02 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-08 19:21:02 +0000 |
| commit | d5a1917ec3dd393ec3576ffd96bebad491f6e7d6 (patch) | |
| tree | 0ad8cee0bb30daf6fe359b4d77fa3369e941c06e | |
| parent | ac494ece062573f8c5385a997349f8dcce8d6285 (diff) | |
| parent | b065413b0e9684fc991bf528fa6ab7175bb04888 (diff) | |
Merge branch 'dbus-1.10' into dbus-1.10-ci
| -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 }, |