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

Xext: saver: use dixDestroyPixmap() instead of direct driver call 

Direct calls to ScreenRec->DestroyPixmap() blocks cleaning up the wrapping
jungle, so use the proper dix function instead.

See: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1754

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1711>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-30 17:39:12 +02:00
parent 984da40fbb
commit 7ce19233bc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Xext/saver.c
View File

@ -277,13 +277,10 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
static void static void
FreeAttrs(ScreenSaverAttrPtr pAttr) FreeAttrs(ScreenSaverAttrPtr pAttr)
{ {
PixmapPtr pPixmap;
CursorPtr pCursor; CursorPtr pCursor;
if ((pPixmap = pAttr->pBackgroundPixmap) != 0) dixDestroyPixmap(pAttr->pBackgroundPixmap, 0);
(*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap); dixDestroyPixmap(pAttr->pBorderPixmap, 0);
if ((pPixmap = pAttr->pBorderPixmap) != 0)
(*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);
if ((pCursor = pAttr->pCursor) != 0) if ((pCursor = pAttr->pCursor) != 0)
FreeCursor(pCursor, (Cursor) 0); FreeCursor(pCursor, (Cursor) 0);
} }