[xsrc/trunk]: xsrc/external/mit/xorg-server.old/dist/composite pull across fi...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/20b5d479f360
branches:  trunk
changeset: 7510:20b5d479f360
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Mar 31 00:02:06 2023 +0000

description:
pull across fixes for ZDI-CAN-19866 / CVE-2023-1393: use after free

diffstat:

 external/mit/xorg-server.old/dist/composite/compwindow.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r 495b82cf36c7 -r 20b5d479f360 external/mit/xorg-server.old/dist/composite/compwindow.c
--- a/external/mit/xorg-server.old/dist/composite/compwindow.c  Thu Mar 30 23:04:59 2023 +0000
+++ b/external/mit/xorg-server.old/dist/composite/compwindow.c  Fri Mar 31 00:02:06 2023 +0000
@@ -588,6 +588,11 @@ compDestroyWindow (WindowPtr pWin)
     ret = (*pScreen->DestroyWindow) (pWin);
     cs->DestroyWindow = pScreen->DestroyWindow;
     pScreen->DestroyWindow = compDestroyWindow;
+
+    /* Did we just destroy the overlay window? */
+    if (pWin == cs->pOverlayWin)
+        cs->pOverlayWin = NULL;
+
 /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
     return ret;
 }