xserver: Branch 'master'

[GitLab Mirror]

 hw/xwin/winmultiwindowwindow.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9323ba6feddb8551d6fb73bee078aaa75fc65e5f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Oct 3 11:53:06 2024 +0200

    xwin: fix memleak on freeing pixmaps
    
    Xwin's DestroyPixmap proc just free()s the PixmapRec directly, w/o catering
    for devPrivate's, so leaving a memleak. The correct DIX function for this
    is FreePixmap().
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1710>

diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 4aca28930..24e226c51 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -1137,9 +1137,7 @@ winDestroyPixmapMultiwindow(PixmapPtr pPixmap)
     pPixmapPriv->pbmih = NULL;
 
     /* Free the pixmap memory */
-    free(pPixmap);
-    pPixmap = NULL;
-
+    FreePixmap(pPixmap);
     return TRUE;
 }