From b065413b0e9684fc991bf528fa6ab7175bb04888 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 28 Jan 2016 12:24:56 -0800 Subject: [PATCH] marshal-validate: run all the tests instead of just the even ones Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93908 Reviewed-by: Simon McVittie [smcv: Re-enable the failing test that Nick disabled, and fix the expected result; the result given by our current implementation is reasonable.] --- dbus/dbus-marshal-validate-util.c | 4 +--- 1 file changed, 1 insertion(+), 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 },