connman-gnome: fix segfault on connect

Fixes a segfault in the properties application when connecting to a WiFi
service succeeds.

(From OE-Core rev: 767ec69e6ca633e5bde604241a598147075b1ac0)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-04-16 22:37:16 +01:00 committed by Richard Purdie
parent b6cbf1e48c
commit a5afc58319
2 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,30 @@
From 7225bf8e8e9bee42d7d7d02ba754b9fb30a877b6 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 16 Apr 2012 19:15:35 +0100
Subject: [PATCH] connman-gnome: fix segfault due to unchecked null value
If value is NULL here we should not pass it to g_value_get_boxed().
Upstream-Status: Submitted
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
common/connman-dbus.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/connman-dbus.c b/common/connman-dbus.c
index 33ac623..822fc98 100644
--- a/common/connman-dbus.c
+++ b/common/connman-dbus.c
@@ -437,7 +437,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash,
DBG("name %s type %d icon %s", name, type, icon);
value = g_hash_table_lookup(hash, "IPv4.Configuration");
- ipv4 = g_value_get_boxed (value);
+ ipv4 = value ? g_value_get_boxed (value) : NULL;
if (!ipv4)
goto done;
--
1.7.5.4

View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
DEPENDS = "gtk+ dbus"
PR = "r9"
PR = "r10"
SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
@ -17,7 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
file://0003-Fix-setting-IPv4-configuration.patch \
file://0004-Handle-WiFi-authentication-using-an-agent.patch \
file://0005-Remove-all-handling-of-Passphrase-property.patch \
file://0006-Fix-status-descriptions-in-properties-tree.patch"
file://0006-Fix-status-descriptions-in-properties-tree.patch \
file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch"
S = "${WORKDIR}/git"