From 1179938c179a6e96170275e24adac3325539be65 Mon Sep 17 00:00:00 2001 From: Alex Goins Date: Thu, 2 Jul 2020 20:12:43 -0500 Subject: [PATCH] randr: Check rrPrivKey in RRHasScanoutPixmap() RRHasScanoutPixmap() is called from xf86CheckHWCursor(), regardless of whether or not RandR has been initialized. As mentioned in commit 4226c6d, it's possible that RandR has not been initialized if the server is configured with Xinerama and there is more than one X screen. Calling rrGetScrPriv when RandR isn't initialized causes an assertion failure that aborts the server: Xorg: ../include/privates.h:121: dixGetPrivateAddr: Assertion key->initialized' failed. Just as in commit 4226c6d, fix the problem by checking dixPrivateKeyRegistered(rrPrivKey) before calling rrGetScrPriv. Signed-off-by: Alex Goins Acked-by: Olivier Fourdan (cherry picked from commit 8eeff5d7880c6885ee6f206355599f13d739afa7) --- randr/rrcrtc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index ae7e30605..7839a0eda 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -2012,9 +2012,15 @@ RRReplaceScanoutPixmap(DrawablePtr pDrawable, PixmapPtr pPixmap, Bool enable) Bool RRHasScanoutPixmap(ScreenPtr pScreen) { - rrScrPriv(pScreen); + rrScrPrivPtr pScrPriv; int i; + /* Bail out if RandR wasn't initialized. */ + if (!dixPrivateKeyRegistered(rrPrivKey)) + return FALSE; + + pScrPriv = rrGetScrPriv(pScreen); + if (!pScreen->is_output_slave) return FALSE;