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 --- glx/clientinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'glx/clientinfo.c') diff --git a/glx/clientinfo.c b/glx/clientinfo.c index c5fef3074..74ad91991 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 v1.2.3