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

xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL 

Avoids a crash in xf86RotatePrepare -> DamageRegister during
CreateScreenResources if rotation or another transform is configured for
any connected RandR output in xorg.conf. The generic rotation/transform
code generally can't work without the root window currently.

Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/969
Fixes: 094f42cdfe "xfree86/modes: Call xf86RotateRedisplay from
                     xf86CrtcRotate"
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 6a5e47c57d)
This commit is contained in:
Michel Dänzer 2020-02-06 17:57:16 +01:00 committed by Michel Dänzer
parent af2fd88b10
commit 1c3e51daba
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/xf86Rotate.c
View File

@ -176,7 +176,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
DamagePtr damage = xf86_config->rotation_damage; DamagePtr damage = xf86_config->rotation_damage;
RegionPtr region; RegionPtr region;
if (!damage) if (!damage || !pScreen->root)
return FALSE; return FALSE;
xf86RotatePrepare(pScreen); xf86RotatePrepare(pScreen);
region = DamageRegion(damage); region = DamageRegion(damage);