debian/patches/117_nullptr_check_in_query_version.patch | 25 ++++++++++++++++
debian/patches/series | 1
2 files changed, 26 insertions(+)
New commits:
commit 563c45c06e0fe47dc5608e98627a53f78f1fd6a1
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Jun 12 18:36:35 2012 -0700
Add 117_nullptr_check_in_query_version.patch to fix LP: #952896
diff --git a/debian/patches/117_nullptr_check_in_query_version.patch
b/debian/patches/117_nullptr_check_in_query_version.patch
new file mode 100644
index 0000000..0cafb60
--- /dev/null
+++ b/debian/patches/117_nullptr_check_in_query_version.patch
@@ -0,0 +1,25 @@
+commit 7062625c601478d108da1c8da7201f023bd35b54
+Author: Bryce Harrington <br...@canonical.com>
+Date: Tue Jun 12 17:32:21 2012 -0700
+
+ Check for NULL return from xcb_glx_query_version_reply() before deref.
+
+ This can get triggered during login when called from
+ gnome-session-check-accelerated-helper.
+
+ Fixes: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/968284
+ Signed-off-by: Bryce Harrington <br...@canonical.com>
+
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index 12fff22..5da2570 100644
+--- a/src/glx/glxext.c
++++ b/src/glx/glxext.c
+@@ -293,6 +293,8 @@ QueryVersion(Display * dpy, int opcode, int *major, int
*minor)
+
GLX_MINOR_VERSION),
+ NULL);
+
++ if (!reply)
++ return GL_FALSE;
+ if (reply->major_version != GLX_MAJOR_VERSION) {
+ free(reply);
+ return GL_FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index 748f4a1..8c4295e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
101_ubuntu_hidden_glname.patch
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
+117_nullptr_check_in_query_version.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1secs7-0005cz...@vasks.debian.org
