From e006550e29b0252b57f5c1ab59b0504ca747c45a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 11 Aug 2025 11:58:10 +0200
Subject: [PATCH] dbe: fix screen cleanup

The 2nd loop is supposed to free the privates and also clear the pointer
to them. But it instead of clearing the walk'ed pointer, it only clears
the one in the last screen left from the upper loop.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dbe/dbe.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dbe/dbe.c b/dbe/dbe.c
index 4aa9001691..85de98c7dc 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -1237,7 +1237,6 @@ DbeExtensionInit(void)
 {
     ExtensionEntry *extEntry;
     register int i, j;
-    ScreenPtr pScreen = NULL;
     DbeScreenPrivPtr pDbeScreenPriv;
     int nStubbedScreens = 0;
     Bool ddxInitSuccess;
@@ -1270,7 +1269,7 @@ DbeExtensionInit(void)
          * interface.
          */
 
-        pScreen = screenInfo.screens[i];
+        ScreenPtr pScreen = screenInfo.screens[i];
 
         if (!(pDbeScreenPriv = calloc(1, sizeof(DbeScreenPrivRec)))) {
             /* If we can not alloc a window or screen private,
@@ -1325,8 +1324,8 @@ DbeExtensionInit(void)
         /* All screens stubbed.  Clean up and return. */
 
         for (i = 0; i < screenInfo.numScreens; i++) {
-            free(dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
-                                  dbeScreenPrivKey));
+            ScreenPtr pScreen = screenInfo.screens[i];
+            free(dixLookupPrivate(&pScreen->devPrivates, dbeScreenPrivKey));
             dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, NULL);
         }
         return;