summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-06-11 16:28:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 17:07:17 (GMT)
commit0a697caca4fa8f7cc932a8d715ea3210ef6b23f5 (patch)
treeedf7f426f7a6be32ff983613bfbc04b6ab5d66df
parent52c00a5e935c35f8c2f4c074de09748aabb2f4ec (diff)
downloadpoky-0a697caca4fa8f7cc932a8d715ea3210ef6b23f5.tar.gz
menu-cache: Fix segmentation fault
[YOCTO #4353] (From OE-Core master rev: 8c9c6155e6d83675a94b4eaae4ffc6dfeca399ee) (From OE-Core rev: 9bc9bb1eaca328b28aa1e914bb6e756989f7e301) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/menu-cache/files/Fix-segfault.patch31
-rw-r--r--meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb4
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch
new file mode 100644
index 0000000..74a0407
--- /dev/null
+++ b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch
@@ -0,0 +1,31 @@
1From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001
2From: Laurentiu Palcu <laurentiu.palcu@intel.com>
3Date: Mon, 29 Apr 2013 12:04:20 +0300
4Subject: [PATCH] Fix segfault
5
6Apparently, g_io_channel_unref() was called twice: once in the
7menu-cache's on_client_closed() callback and once from the finalize
8function, g_io_unix_finalize()/g_io_win32_finalize(), which is called
9anyway when the source is removed.
10
11Upstream-Status: Pending
12Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
13---
14 menu-cache-daemon/menu-cached.c | 1 -
15 1 file changed, 1 deletion(-)
16
17diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
18index e246bb4..a10b6db 100644
19--- a/menu-cache-daemon/menu-cached.c
20+++ b/menu-cache-daemon/menu-cached.c
21@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data)
22 }
23 }
24 /* DEBUG("client closed"); */
25- g_io_channel_unref(ch);
26 }
27
28 static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data)
29--
301.7.9.5
31
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
index d0c5340..2aabd4a 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11SECTION = "x11/libs" 11SECTION = "x11/libs"
12DEPENDS = "glib-2.0 zlib" 12DEPENDS = "glib-2.0 zlib"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz" 14SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \
15 file://Fix-segfault.patch \
16 "
15 17
16SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" 18SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0"
17SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" 19SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e"