OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Fix number of property values to read in glXImportContextEXT

Browse Source 
We were trying to read twice as many as the X server sent us, which
upset XCB:

[xcb] Too much data requested from _XRead
[xcb] This is most likely caused by a broken X extension library
[xcb] Aborting, sorry about that.
glx-free-context: ../../src/xcb_io.c:732: _XRead: Assertion `!xcb_xlib_too_much_data_requested' failed.

Fixing this takes 3 GLX piglit tests from crash to pass.

Fixes: 0852162950 "glx: Be more tolerant in glXImportContext (v2)"
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Michel Dänzer
2018-06-01 18:59:36 +02:00
committed by Michel Dänzer
parent c765c39ea7
commit 6b8f3724c8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glx/glxcmds.c
View File

@@ -1463,7 +1463,7 @@ glXImportContextEXT(Display *dpy, GLXContextID contextID)
if (_XReply(dpy, (xReply *) & reply, 0, False) && if (_XReply(dpy, (xReply *) & reply, 0, False) &&
reply.n < (INT32_MAX / 2)) { reply.n < (INT32_MAX / 2)) {
for (i = 0; i < reply.n * 2; i++) { for (i = 0; i < reply.n; i++) {
int prop[2]; int prop[2];
_XRead(dpy, (char *)prop, sizeof(prop)); _XRead(dpy, (char *)prop, sizeof(prop));