Attachment 134464 Details for Bug 102979 – dbus-send: Reassure the compiler that secondary_type is initialized

[patch] dbus-send: Reassure the compiler that secondary_type is initialized

0001-dbus-send-Reassure-the-compiler-that-secondary_type-.patch (text/plain), 1.22 KB, created by Simon McVittie on 2017-09-25 15:25:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-09-25 15:25:34 UTC

Size: 1.22 KB

patch

obsolete

>From 6d4eb133d871d426e2c769b0ecaa55a897c767ae Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 25 Sep 2017 16:19:39 +0100
>Subject: [PATCH] dbus-send: Reassure the compiler that secondary_type is
> initialized
>
>It's initialized to a non-trivial value whenever container_type
>is DBUS_TYPE_DICT_ENTRY, and subsequently only used if
>container_type is DBUS_TYPE_DICT_ENTRY, but Debian's gcc 7.2.0-7
>doesn't seem to be able to infer that any more, causing build failure
>under -Werror=maybe-uninitialized.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> tools/dbus-send.c | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/tools/dbus-send.c b/tools/dbus-send.c
>index 0dc1f5b3..235e58e5 100644
>--- a/tools/dbus-send.c
>+++ b/tools/dbus-send.c
>@@ -464,6 +464,7 @@ main (int argc, char *argv[])
>       DBusMessageIter container_iter;
> 
>       type = DBUS_TYPE_INVALID;
>+      secondary_type = DBUS_TYPE_INVALID;
>       arg = argv[i++];
>       c = strchr (arg, ':');
> 
>@@ -544,6 +545,7 @@ main (int argc, char *argv[])
> 	}
>       else if (container_type == DBUS_TYPE_DICT_ENTRY)
> 	{
>+	  _dbus_assert (secondary_type != DBUS_TYPE_INVALID);
> 	  append_dict (target_iter, type, secondary_type, c);
> 	}
>       else
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 102979: 134464

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.