fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 05:18:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xf86: check return value of XF86_CRTC_CONFIG_PTR in xf86CompatOutput()

Browse source 
If privates[xf86CrtcConfigPrivateIndex].ptr is NULL, this will cause
a segfault.

Possible fix for !1241

Signed-off-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
(cherry picked from commit 907c501926)

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2146>
This commit is contained in:
Benjamin Valentin 2021-12-27 14:53:22 +01:00 • committed by Marge Bot
parent fe14f01089
commit cc3a8739eb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/modes/xf86Crtc.h
View file

@ -842,7 +842,7 @@ xf86CompatOutput(ScrnInfoPtr pScrn)
if (xf86CrtcConfigPrivateIndex == -1)
return NULL;
config = XF86_CRTC_CONFIG_PTR(pScrn);
if (config->compat_output < 0)
if ((config == NULL) || (config->compat_output < 0))
return NULL;
return config->output[config->compat_output];
}