X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2FCVE-2014-8xxx%2F0035-CVE-2014-8098-additional.patch;fp=debian%2Fpatches%2FCVE-2014-8xxx%2F0035-CVE-2014-8098-additional.patch;h=612561f29e41c16dc8c0f2e2b19cea0558ca9a48;hp=0000000000000000000000000000000000000000;hb=7217e0ca50bba73dad94782e67980aeeb24ab693;hpb=a09e091a5c996d46a398abb27b06fe504591673f 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 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 +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 +Reviewed-by: Alan Coopersmith +Signed-off-by: Alan Coopersmith + +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 +