mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libx11: Add missing NULL check

Browse Source 
Add a check for NULL on dereferencing the xim pointer.
Using mplayer with the x11 backend will trigger this and result
in a segfault.

(From OE-Core rev: f7d8947744d7dd1d08721ef0e707912304722d2b)

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Drew Moseley
2014-07-27 19:05:57 -04:00
committed by Richard Purdie
parent 6a7b989933
commit 062bd810fc
2 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch Normal file
View File

@@ -0,0 +1,72 @@
From 4d85d5f3bd8afac893738fd88e19d8cb5cf998ff Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew_moseley@mentor.com>
Date: Sun, 27 Jul 2014 13:10:07 -0400
Subject: [PATCH] libX11: Add missing NULL check on im and im->methods
Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=81822]
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
src/xlibi18n/ICWrap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWrap.c
--- libX11-1.6.2-orig/src/xlibi18n/ICWrap.c 2014-07-27 13:38:29.586666449 -0400
+++ libX11-1.6.2/src/xlibi18n/ICWrap.c 2014-07-27 13:41:39.671609030 -0400
@@ -169,7 +169,7 @@
va_list var;
int total_count;
XIMArg *args;
- char *ret;
+ char *ret = NULL;
/*
* so count the stuff dangling here
@@ -185,7 +185,8 @@
_XIMVaToNestedList(var, total_count, &args);
va_end(var);
- ret = (*im->methods->set_values) (im, args);
+ if (im && im->methods)
+ ret = (*im->methods->set_values) (im, args);
if (args) Xfree(args);
return ret;
}
@@ -196,7 +197,7 @@
va_list var;
int total_count;
XIMArg *args;
- char *ret;
+ char *ret = NULL;
/*
* so count the stuff dangling here
@@ -212,7 +213,8 @@
_XIMVaToNestedList(var, total_count, &args);
va_end(var);
- ret = (*im->methods->get_values) (im, args);
+ if (im && im->methods)
+ ret = (*im->methods->get_values) (im, args);
if (args) Xfree(args);
return ret;
}
@@ -228,7 +230,7 @@
va_list var;
int total_count;
XIMArg *args;
- XIC ic;
+ XIC ic = NULL;
/*
* so count the stuff dangling here
@@ -244,7 +246,8 @@
_XIMVaToNestedList(var, total_count, &args);
va_end(var);
- ic = (XIC) (*im->methods->create_ic) (im, args);
+ if (im && im->methods)
+ ic = (XIC) (*im->methods->create_ic) (im, args);
if (args) Xfree(args);
if (ic) {
ic->core.next = im->core.ic_chain;

1
meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
View File

@@ -5,6 +5,7 @@ BBCLASSEXTEND = "native nativesdk"
SRC_URI += "file://disable_tests.patch \
file://nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch \
file://libX11-Add-missing-NULL-check.patch \
"
SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"