mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
libx11: remove unused patch and FILESEXTRAPATHS
* 0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch was removed from SRC_URI in: https://git.openembedded.org/openembedded-core/commit/?id=e13f651f73db0f26f4645447ab5fa17e36d1903b (From OE-Core rev: ee37d9f05c047e1dd68e0cb47b809240d2f33835) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b481883f0f
commit
58061d15eb
-57
@@ -1,57 +0,0 @@
|
|||||||
CVE: CVE-2022-3554
|
|
||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
|
|
||||||
From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Thomas E. Dickey" <dickey@invisible-island.net>
|
|
||||||
Date: Tue, 4 Oct 2022 18:26:17 -0400
|
|
||||||
Subject: [PATCH] fix a memory leak in XRegisterIMInstantiateCallback
|
|
||||||
|
|
||||||
Analysis:
|
|
||||||
|
|
||||||
_XimRegisterIMInstantiateCallback() opens an XIM and closes it using
|
|
||||||
the internal function pointers, but the internal close function does
|
|
||||||
not free the pointer to the XIM (this would be done in XCloseIM()).
|
|
||||||
|
|
||||||
Report/patch:
|
|
||||||
|
|
||||||
Date: Mon, 03 Oct 2022 18:47:32 +0800
|
|
||||||
From: Po Lu <luangruo@yahoo.com>
|
|
||||||
To: xorg-devel@lists.x.org
|
|
||||||
Subject: Re: Yet another leak in Xlib
|
|
||||||
|
|
||||||
For reference, here's how I'm calling XRegisterIMInstantiateCallback:
|
|
||||||
|
|
||||||
XSetLocaleModifiers ("");
|
|
||||||
XRegisterIMInstantiateCallback (compositor.display,
|
|
||||||
XrmGetDatabase (compositor.display),
|
|
||||||
(char *) compositor.resource_name,
|
|
||||||
(char *) compositor.app_name,
|
|
||||||
IMInstantiateCallback, NULL);
|
|
||||||
|
|
||||||
and XMODIFIERS is:
|
|
||||||
|
|
||||||
@im=ibus
|
|
||||||
|
|
||||||
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
|
|
||||||
---
|
|
||||||
modules/im/ximcp/imInsClbk.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
|
|
||||||
index 95b379cb..c10e347f 100644
|
|
||||||
--- a/modules/im/ximcp/imInsClbk.c
|
|
||||||
+++ b/modules/im/ximcp/imInsClbk.c
|
|
||||||
@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback(
|
|
||||||
if( xim ) {
|
|
||||||
lock = True;
|
|
||||||
xim->methods->close( (XIM)xim );
|
|
||||||
+ /* XIMs must be freed manually after being opened; close just
|
|
||||||
+ does the protocol to deinitialize the IM. */
|
|
||||||
+ XFree( xim );
|
|
||||||
lock = False;
|
|
||||||
icb->call = True;
|
|
||||||
callback( display, client_data, NULL );
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
@@ -18,14 +18,12 @@ DEPENDS += "xorgproto \
|
|||||||
|
|
||||||
PROVIDES = "virtual/libx11"
|
PROVIDES = "virtual/libx11"
|
||||||
|
|
||||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
|
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
XORG_PN = "libX11"
|
XORG_PN = "libX11"
|
||||||
|
|
||||||
SRC_URI += "file://disable_tests.patch \
|
SRC_URI += "file://disable_tests.patch"
|
||||||
"
|
|
||||||
SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518"
|
SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518"
|
||||||
|
|
||||||
inherit gettext
|
inherit gettext
|
||||||
|
|||||||
Reference in New Issue
Block a user