summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-18 17:45:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:41:05 +0100
commitbfb1cf74c5c8ed7523caa564591ac2ffc84f9498 (patch)
tree206f5205bebee53530719c731bbafbb6fccb09f1 /meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
parentb52526dd049365bdbed64207079d11dfd65b1d83 (diff)
downloadpoky-bfb1cf74c5c8ed7523caa564591ac2ffc84f9498.tar.gz
libx11: upgrade to 1.6.3
Drop backported patch always-use-XCOMM patch. Refresh Add-missing-NULL-check. (From OE-Core rev: 515d8b5de2d0ebd601d98ca16036aafdf54ce043) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
index 30686206ab..a60e985564 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
@@ -29,7 +29,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
29- ret = (*im->methods->set_values) (im, args); 29- ret = (*im->methods->set_values) (im, args);
30+ if (im && im->methods) 30+ if (im && im->methods)
31+ ret = (*im->methods->set_values) (im, args); 31+ ret = (*im->methods->set_values) (im, args);
32 if (args) Xfree(args); 32 Xfree(args);
33 return ret; 33 return ret;
34 } 34 }
35@@ -196,7 +197,7 @@ 35@@ -196,7 +197,7 @@
@@ -48,7 +48,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
48- ret = (*im->methods->get_values) (im, args); 48- ret = (*im->methods->get_values) (im, args);
49+ if (im && im->methods) 49+ if (im && im->methods)
50+ ret = (*im->methods->get_values) (im, args); 50+ ret = (*im->methods->get_values) (im, args);
51 if (args) Xfree(args); 51 Xfree(args);
52 return ret; 52 return ret;
53 } 53 }
54@@ -228,7 +230,7 @@ 54@@ -228,7 +230,7 @@
@@ -67,6 +67,6 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
67- ic = (XIC) (*im->methods->create_ic) (im, args); 67- ic = (XIC) (*im->methods->create_ic) (im, args);
68+ if (im && im->methods) 68+ if (im && im->methods)
69+ ic = (XIC) (*im->methods->create_ic) (im, args); 69+ ic = (XIC) (*im->methods->create_ic) (im, args);
70 if (args) Xfree(args); 70 Xfree(args);
71 if (ic) { 71 if (ic) {
72 ic->core.next = im->core.ic_chain; 72 ic->core.next = im->core.ic_chain;