diff options
| author |   Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-06-11 17:28:24 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-11 17:32:50 +0100 |
| commit | 9bc9bb1eaca328b28aa1e914bb6e756989f7e301 (patch) | |
| tree | 616ff96ae6ea81ff841dbb7bbc1c97ea93a6dcf1 /meta/recipes-graphics | |
| parent | 60dba251d2c7966643474940df337421e9521cd6 (diff) | |
| download | openembedded-core-9bc9bb1eaca328b28aa1e914bb6e756989f7e301.tar.gz | |
menu-cache: Fix segmentation fault
[YOCTO #4353]
(From OE-Core master rev: 8c9c6155e6d83675a94b4eaae4ffc6dfeca399ee)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/menu-cache/files/Fix-segfault.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb | 4 |
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 0000000000..74a04074ec --- /dev/null +++ b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch @@ -0,0 +1,31 @@ +From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001 +From: Laurentiu Palcu <laurentiu.palcu@intel.com> +Date: Mon, 29 Apr 2013 12:04:20 +0300 +Subject: [PATCH] Fix segfault + +Apparently, g_io_channel_unref() was called twice: once in the +menu-cache's on_client_closed() callback and once from the finalize +function, g_io_unix_finalize()/g_io_win32_finalize(), which is called +anyway when the source is removed. + +Upstream-Status: Pending +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> +--- + menu-cache-daemon/menu-cached.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c +index e246bb4..a10b6db 100644 +--- a/menu-cache-daemon/menu-cached.c ++++ b/menu-cache-daemon/menu-cached.c +@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data) + } + } + /* DEBUG("client closed"); */ +- g_io_channel_unref(ch); + } + + static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data) +-- +1.7.9.5 + 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 d0c5340f89..2aabd4a87e 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 \ SECTION = "x11/libs" DEPENDS = "glib-2.0 zlib" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \ + file://Fix-segfault.patch \ + " SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" |