Attachment 24436 Details for Bug 17803 – 0001-Bug-17803-Fix-both-test-case-and-validation-logic.patch

[patch] 0001-Bug-17803-Fix-both-test-case-and-validation-logic.patch

0001-Bug-17803-Fix-both-test-case-and-validation-logic.patch (text/plain), 1.92 KB, created by Colin Walters on 2009-04-01 09:05:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2009-04-01 09:05:35 UTC

Size: 1.92 KB

patch

obsolete

>From a61803cdb3c4166e10e9e33e4c39aeca0163a96c Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Wed, 1 Apr 2009 12:02:00 -0400
>Subject: [PATCH] Bug 17803 - Fix both test case and validation logic
>
>The previous commit had errors in both the test case and
>the validation logic.  The test case was missing a trailing
>comma before the previous one, so we weren't testing the
>signature we thought we were.
>
>The validation logic was wrong because if the type was not valid,
>we'd drop through the entire if clause, and thus skip returning
>an error code, and accept the signature.
>---
> dbus/dbus-marshal-validate-util.c |    2 +-
> dbus/dbus-marshal-validate.c      |   13 +++++++------
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c
>index 5365d6d..ac901c3 100644
>--- a/dbus/dbus-marshal-validate-util.c
>+++ b/dbus/dbus-marshal-validate-util.c
>@@ -227,7 +227,7 @@ _dbus_marshal_validate_test (void)
>     "not a valid signature",
>     "123",
>     ".",
>-    "("
>+    "(",
>     "a{(ii)i}" /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */
>   };
> 
>diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
>index 35998cb..ee95548 100644
>--- a/dbus/dbus-marshal-validate.c
>+++ b/dbus/dbus-marshal-validate.c
>@@ -246,14 +246,15 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
> 	    }
>         }
> 
>-      if (last == DBUS_DICT_ENTRY_BEGIN_CHAR &&
>-          _dbus_type_is_valid (*p) &&
>-          !dbus_type_is_basic (*p))
>+      if (last == DBUS_DICT_ENTRY_BEGIN_CHAR)
>         {
>-          result = DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE;
>-          goto out;
>+          if (!(_dbus_type_is_valid (*p) && dbus_type_is_basic (*p)))
>+            {
>+              result = DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE;
>+              goto out;
>+            }
>         }
>-        
>+
>       last = *p;
>       ++p;
>     }
>-- 
>1.6.0.6
>

Actions: View | Splinter Review

Attachments on bug 17803: 19288 | 24436

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.