summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-04-16 22:37:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 22:53:00 +0100
commita5afc58319d3c7e082a090f5fad7f89bd6e588c9 (patch)
tree3d4b295eb420a7cd5b0bcad0e8d2049b784ef4b8
parentb6cbf1e48c6ba3a0353f4ee71c43292587210ca5 (diff)
downloadpoky-a5afc58319d3c7e082a090f5fad7f89bd6e588c9.tar.gz
poky-a5afc58319d3c7e082a090f5fad7f89bd6e588c9.tar.bz2
poky-a5afc58319d3c7e082a090f5fad7f89bd6e588c9.zip
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>
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch30
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome_0.5.bb5
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch b/meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
new file mode 100644
index 0000000000..3e054ba7af
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
@@ -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
+
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 93aac2182a..e2e8deba5d 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -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"