Attachment 51352 Details for Bug 33870 – [6/9 v2] writer_recurse_variant: set type_str to a non-NULL value

[patch] [6/9 v2] writer_recurse_variant: set type_str to a non-NULL value

0006-writer_recurse_variant-set-type_str-to-a-non-NULL-va.patch (text/plain), 1.38 KB, created by Simon McVittie on 2011-09-19 09:41:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-19 09:41:35 UTC

Size: 1.38 KB

patch

obsolete

>From e01c10ffcac06df9813989b54cfd01f74c0d059b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 10 Jun 2011 14:10:00 +0100
>Subject: [PATCH 6/9] writer_recurse_variant: set type_str to a non-NULL value
>
>This will allow us to guarantee that type_str is not, in fact, NULL.
>---
> dbus/dbus-marshal-recursive.c |   13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
>index 3e0c634..5e9070e 100644
>--- a/dbus/dbus-marshal-recursive.c
>+++ b/dbus/dbus-marshal-recursive.c
>@@ -1948,13 +1948,16 @@ writer_recurse_variant (DBusTypeWriter   *writer,
>   if (!write_or_verify_typecode (writer, DBUS_TYPE_VARIANT))
>     return FALSE;
> 
>-  /* If not enabled, mark that we have no type_str anymore ... */
>-
>+  /* If not enabled, we are about to (pretend to) write the contained type */
>   if (!writer->enabled)
>     {
>-      sub->type_str = NULL;
>-      sub->type_pos = -1;
>-
>+      /* this is set in writer_recurse_init_and_check for a variant
>+       * sub-iterator ... */
>+      _dbus_assert (sub->type_pos_is_expectation);
>+      /* ... and it means that we won't actually be writing to this
>+       * string, so casting away its constness is OK */
>+      sub->type_str = (DBusString *) contained_type;
>+      sub->type_pos = contained_type_start;
>       return TRUE;
>     }
> 
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 33870: 47935 | 47936 | 47938 | 47939 | 47940 | 47942 | 47944 | 47945 | 47947 | 51347 | 51348 | 51349 | 51350 | 51351 | 51352 | 51353 | 51354 | 51355

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.