frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Keith Packard 2014-12-09 09:30:58 -08:00 committed by Alan Coopersmith
parent b20912c3d4
commit 61b17c0f10
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glx/clientinfo.c
View File

@ -36,13 +36,14 @@ set_client_info(__GLXclientState * cl, xGLXSetClientInfoARBReq * req,
ClientPtr client = cl->client; ClientPtr client = cl->client;
char *gl_extensions; char *gl_extensions;
char *glx_extensions; char *glx_extensions;
int size;
REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq); REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
/* Verify that the size of the packet matches the size inferred from the /* Verify that the size of the packet matches the size inferred from the
* sizes specified for the various fields. * 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_mul(req->numVersions, bytes_per_version));
size = safe_add(size, safe_pad(req->numGLExtensionBytes)); size = safe_add(size, safe_pad(req->numGLExtensionBytes));
size = safe_add(size, safe_pad(req->numGLXExtensionBytes)); size = safe_add(size, safe_pad(req->numGLXExtensionBytes));