Commit | Line | Data |
---|---|---|
7217e0ca ML |
1 | From 61b17c0f10307e25e51e30e6fb1d3e3127f82d86 Mon Sep 17 00:00:00 2001 |
2 | From: Keith Packard <keithp@keithp.com> | |
3 | Date: Tue, 9 Dec 2014 09:30:58 -0800 | |
4 | Subject: glx: Can't mix declarations and code in X.org sources [CVE-2014-8098 | |
5 | pt. 9] | |
6 | ||
7 | We're using compiler compatibility settings which generate warnings | |
8 | when a variable is declared after the first statement. | |
9 | ||
10 | Signed-off-by: Keith Packard <keithp@keithp.com> | |
11 | Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> | |
12 | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> | |
13 | ||
7217e0ca ML |
14 | --- a/glx/clientinfo.c |
15 | +++ b/glx/clientinfo.c | |
4db25562 | 16 | @@ -36,13 +36,14 @@ set_client_info(__GLXclientState * cl, x |
7217e0ca ML |
17 | ClientPtr client = cl->client; |
18 | char *gl_extensions; | |
19 | char *glx_extensions; | |
20 | + int size; | |
21 | ||
22 | REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq); | |
23 | ||
24 | /* Verify that the size of the packet matches the size inferred from the | |
25 | * sizes specified for the various fields. | |
26 | */ | |
27 | - int size = sz_xGLXSetClientInfoARBReq; | |
28 | + size = sz_xGLXSetClientInfoARBReq; | |
29 | size = safe_add(size, safe_mul(req->numVersions, bytes_per_version)); | |
30 | size = safe_add(size, safe_pad(req->numGLExtensionBytes)); | |
31 | size = safe_add(size, safe_pad(req->numGLXExtensionBytes)); |