Imported Debian patch 2:1.15.1-0ubuntu2.6

[deb_xorg-server.git] / debian / patches / CVE-2014-8xxx / 0035-CVE-2014-8098-additional.patch

diff --git a/debian/patches/CVE-2014-8xxx/0035-CVE-2014-8098-additional.patch b/debian/patches/CVE-2014-8xxx/0035-CVE-2014-8098-additional.patch
new file mode 100644 (file)
index 0000000..612561f
--- /dev/null
+++ b/debian/patches/CVE-2014-8xxx/0035-CVE-2014-8098-additional.patch
@@ -0,0 +1,36 @@
+From 61b17c0f10307e25e51e30e6fb1d3e3127f82d86 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Tue, 9 Dec 2014 09:30:58 -0800
+Subject: glx: Can't mix declarations and code in X.org sources [CVE-2014-8098
+ pt. 9]
+
+We're using compiler compatibility settings which generate warnings
+when a variable is declared after the first statement.
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+diff --git a/glx/clientinfo.c b/glx/clientinfo.c
+index c5fef30..74ad919 100644
+--- a/glx/clientinfo.c
++++ b/glx/clientinfo.c
+@@ -36,13 +36,14 @@ set_client_info(__GLXclientState * cl, xGLXSetClientInfoARBReq * req,
+     ClientPtr client = cl->client;
+     char *gl_extensions;
+     char *glx_extensions;
++    int size;
+ 
+     REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
+ 
+     /* Verify that the size of the packet matches the size inferred from the
+      * sizes specified for the various fields.
+      */
+-    int size = sz_xGLXSetClientInfoARBReq;
++    size = sz_xGLXSetClientInfoARBReq;
+     size = safe_add(size, safe_mul(req->numVersions, bytes_per_version));
+     size = safe_add(size, safe_pad(req->numGLExtensionBytes));
+     size = safe_add(size, safe_pad(req->numGLXExtensionBytes));
+-- 
+cgit v0.10.2
+