Attachment 132427 Details for Bug 101568 – [01] _dbus_marshal_validate_test: Merge two sets of signature validity checks

[patch] [01] _dbus_marshal_validate_test: Merge two sets of signature validity checks

0005-_dbus_marshal_validate_test-Merge-two-sets-of-signat.patch (text/plain), 3.75 KB, created by Simon McVittie on 2017-07-04 17:54:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-04 17:54:47 UTC

Size: 3.75 KB

patch

obsolete

>From cdb8a7b10f1bd78fcb801a8b3b0b1cb151d54a4c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 4 Jul 2017 17:00:59 +0100
>Subject: [PATCH 05/19] _dbus_marshal_validate_test: Merge two sets of
> signature validity checks
>
>The deleted lines used to be a test for _dbus_validate_signature(),
>until I deleted that function. We also had a completely separate
>test for _dbus_validate_signature_with_reason() which remains present.
>Some of the test vectors were tested in both places.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-marshal-validate-util.c | 62 ++++++---------------------------------
> 1 file changed, 9 insertions(+), 53 deletions(-)
>
>diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c
>index 4174ae42..79671a4f 100644
>--- a/dbus/dbus-marshal-validate-util.c
>+++ b/dbus/dbus-marshal-validate-util.c
>@@ -66,7 +66,9 @@ run_validity_tests (const ValidityTest *tests,
> 
> static const ValidityTest signature_tests[] = {
>   { "", DBUS_VALID },
>+  { "sss", DBUS_VALID },
>   { "i", DBUS_VALID },
>+  { "b", DBUS_VALID },
>   { "ai", DBUS_VALID },
>   { "(i)", DBUS_VALID },
>   { "w", DBUS_INVALID_UNKNOWN_TYPECODE },
>@@ -95,6 +97,13 @@ static const ValidityTest signature_tests[] = {
>   { "a{ia}", DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE },
>   { "a{}", DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS },
>   { "a{aii}", DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE },
>+  { " ", DBUS_INVALID_UNKNOWN_TYPECODE },
>+  { "not a valid signature", DBUS_INVALID_UNKNOWN_TYPECODE },
>+  { "123", DBUS_INVALID_UNKNOWN_TYPECODE },
>+  { ".", DBUS_INVALID_UNKNOWN_TYPECODE },
>+  /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */
>+  { "a{(ii)i}", DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE },
>+
>   /* { "a{i}", DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD }, */
>   /* { "{is}", DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY }, */
>   /* { "a{isi}", DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS }, */
>@@ -213,22 +222,6 @@ _dbus_marshal_validate_test (void)
>     "foo bar"
>   };
> 
>-  const char *valid_signatures[] = {
>-    "",
>-    "sss",
>-    "i",
>-    "b"
>-  };
>-
>-  const char *invalid_signatures[] = {
>-    " ",
>-    "not a valid signature",
>-    "123",
>-    ".",
>-    "(",
>-    "a{(ii)i}" /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */
>-  };
>-
>   /* Signature with reason */
> 
>   run_validity_tests (signature_tests, _DBUS_N_ELEMENTS (signature_tests),
>@@ -430,43 +423,6 @@ _dbus_marshal_validate_test (void)
>       ++i;
>     }
> 
>-  /* Signature validation */
>-  i = 0;
>-  while (i < (int) _DBUS_N_ELEMENTS (valid_signatures))
>-    {
>-      _dbus_string_init_const (&str, valid_signatures[i]);
>-
>-      if (_dbus_validate_signature_with_reason (&str, 0,
>-            _dbus_string_get_length (&str)) != DBUS_VALID)
>-        {
>-          _dbus_warn ("Signature \"%s\" should have been valid and OOM should not have occurred", valid_signatures[i]);
>-          _dbus_assert_not_reached ("invalid signature");
>-        }
>-
>-      ++i;
>-    }
>-
>-  i = 0;
>-  while (i < (int) _DBUS_N_ELEMENTS (invalid_signatures))
>-    {
>-      DBusValidity validity;
>-
>-      _dbus_string_init_const (&str, invalid_signatures[i]);
>-
>-      validity = _dbus_validate_signature_with_reason (&str, 0,
>-          _dbus_string_get_length (&str));
>-
>-      /* Validity values less than DBUS_VALID are OOM or unknown validity.
>-       * TODO: specify in which way each one should be invalid */
>-      if (validity <= DBUS_VALID)
>-        {
>-          _dbus_warn ("Signature \"%s\" should have been invalid and OOM should not have occurred", invalid_signatures[i]);
>-          _dbus_assert_not_reached ("valid signature");
>-        }
>-
>-      ++i;
>-    }
>-
>   /* Validate claimed length longer than real length */
>   _dbus_string_init_const (&str, "abc.efg");
>   if (_dbus_validate_bus_name (&str, 0, 8))
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 101568: 132161 | 132162 | 132412 | 132413 | 132414 | 132415 | 132416 | 132417 | 132418 | 132427 | 132428 | 132429 | 132430 | 132431 | 132432 | 132433 | 132434 | 132435 | 132436 | 132437 | 132438 | 132439 | 132440 | 132441 | 132442 | 132447 | 132454

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.