menu-cache: Fix segmentation fault
[YOCTO #4353] (From OE-Core rev: 8c9c6155e6d83675a94b4eaae4ffc6dfeca399ee) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2346b46558
commit
eb9e50d514
|
@ -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
|
||||||
|
|
|
@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||||
SECTION = "x11/libs"
|
SECTION = "x11/libs"
|
||||||
DEPENDS = "glib-2.0 zlib"
|
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[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0"
|
||||||
SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e"
|
SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e"
|
||||||
|
|
Loading…
Reference in New Issue