fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

egl/x11: don't forget to exit the attrib list loop

Browse source 
Without this check, if we receive any attribs from the client, we either
find an X11/XCB screen fd in there, or we keep going until we end up in
random bits of memory and crash.

Fixes: 4aebd86f9a ("egl/x11: pick the user requested screen")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10717>
(cherry picked from commit 2af08bf7b6)
This commit is contained in:
Eric Engestrom 2021-05-09 18:10:32 +02:00
parent d7d4250ad8
commit 0c3328ef09
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -175,7 +175,7 @@
"description": "egl/x11: don't forget to exit the attrib list loop",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "4aebd86f9a1b0db0ebcc69c30c00f0981a28e6a6"
},

5
src/egl/drivers/dri2/platform_x11.c
View file

@ -1211,7 +1211,10 @@ dri2_find_screen_for_display(const _EGLDisplay *disp, int fallback_screen)
{
const EGLAttrib *attr;
for (attr = disp->Options.Attribs; attr; attr += 2) {
if (!disp->Options.Attribs)
return fallback_screen;
for (attr = disp->Options.Attribs; attr[0] != EGL_NONE; attr += 2) {
if (attr[0] == EGL_PLATFORM_X11_SCREEN_EXT ||
attr[0] == EGL_PLATFORM_XCB_SCREEN_EXT)
return attr[1];