Attachment 103568 Details for Bug 81822 – Patch to add the missing checks for NULL.

Patch to add the missing checks for NULL.

0001-libX11-Add-missing-NULL-check-on-im-and-im-methods.patch (text/plain), 1.96 KB, created by Drew Moseley on 2014-07-27 22:42:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Drew Moseley

Created: 2014-07-27 22:42:10 UTC

Size: 1.96 KB

patch

obsolete

>From d6e201ad08f9090d531dda661b9aee003a55221c 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
>
>Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
>---
> src/xlibi18n/ICWrap.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
>index 8c1b4a0..69f080d 100644
>--- a/src/xlibi18n/ICWrap.c
>+++ b/src/xlibi18n/ICWrap.c
>@@ -169,7 +169,7 @@ XSetIMValues(XIM im, ...)
>     va_list var;
>     int     total_count;
>     XIMArg *args;
>-    char   *ret;
>+    char   *ret = NULL;
> 
>     /*
>      * so count the stuff dangling here
>@@ -185,7 +185,8 @@ XSetIMValues(XIM im, ...)
>     _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);
>     Xfree(args);
>     return ret;
> }
>@@ -196,7 +197,7 @@ XGetIMValues(XIM im, ...)
>     va_list var;
>     int     total_count;
>     XIMArg *args;
>-    char   *ret;
>+    char   *ret = NULL;
> 
>     /*
>      * so count the stuff dangling here
>@@ -212,7 +213,8 @@ XGetIMValues(XIM im, ...)
>     _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);
>     Xfree(args);
>     return ret;
> }
>@@ -228,7 +230,7 @@ XCreateIC(XIM im, ...)
>     va_list var;
>     int     total_count;
>     XIMArg *args;
>-    XIC     ic;
>+    XIC     ic = NULL;
> 
>     /*
>      * so count the stuff dangling here
>@@ -244,7 +246,8 @@ XCreateIC(XIM im, ...)
>     _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);
>     Xfree(args);
>     if (ic) {
> 	ic->core.next = im->core.ic_chain;
>-- 
>1.9.1
>

Actions: View

Attachments on bug 81822: 103568

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.