summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-04-16 21:37:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 21:53:00 (GMT)
commita5afc58319d3c7e082a090f5fad7f89bd6e588c9 (patch)
tree3d4b295eb420a7cd5b0bcad0e8d2049b784ef4b8 /meta/recipes-connectivity/connman
parentb6cbf1e48c6ba3a0353f4ee71c43292587210ca5 (diff)
downloadpoky-a5afc58319d3c7e082a090f5fad7f89bd6e588c9.tar.gz
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>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-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 0000000..3e054ba
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
@@ -0,0 +1,30 @@
1From 7225bf8e8e9bee42d7d7d02ba754b9fb30a877b6 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 16 Apr 2012 19:15:35 +0100
4Subject: [PATCH] connman-gnome: fix segfault due to unchecked null value
5
6If value is NULL here we should not pass it to g_value_get_boxed().
7
8Upstream-Status: Submitted
9
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11---
12 common/connman-dbus.c | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-)
14
15diff --git a/common/connman-dbus.c b/common/connman-dbus.c
16index 33ac623..822fc98 100644
17--- a/common/connman-dbus.c
18+++ b/common/connman-dbus.c
19@@ -437,7 +437,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash,
20 DBG("name %s type %d icon %s", name, type, icon);
21
22 value = g_hash_table_lookup(hash, "IPv4.Configuration");
23- ipv4 = g_value_get_boxed (value);
24+ ipv4 = value ? g_value_get_boxed (value) : NULL;
25
26 if (!ipv4)
27 goto done;
28--
291.7.5.4
30
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 93aac21..e2e8deb 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 \
8 8
9DEPENDS = "gtk+ dbus" 9DEPENDS = "gtk+ dbus"
10 10
11PR = "r9" 11PR = "r10"
12 12
13SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5" 13SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
14SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \ 14SRC_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 \
17 file://0003-Fix-setting-IPv4-configuration.patch \ 17 file://0003-Fix-setting-IPv4-configuration.patch \
18 file://0004-Handle-WiFi-authentication-using-an-agent.patch \ 18 file://0004-Handle-WiFi-authentication-using-an-agent.patch \
19 file://0005-Remove-all-handling-of-Passphrase-property.patch \ 19 file://0005-Remove-all-handling-of-Passphrase-property.patch \
20 file://0006-Fix-status-descriptions-in-properties-tree.patch" 20 file://0006-Fix-status-descriptions-in-properties-tree.patch \
21 file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch"
21 22
22S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
23 24