From 443a98cbbe93915505eb667258b385a75a55ab3a Mon Sep 17 00:00:00 2001
From: Joseph <119084558+DerjenigeUberMensch@users.noreply.github.com>
Date: Sat, 10 Aug 2024 02:10:03 +0800
Subject: [PATCH] Fixed manging windows not freeing memory properly, scan()

This should fix the incorrect memory freeing of items, and hopefully not segfault
---
 src/client.c |  1 -
 src/main.c   | 10 +++++++---
 src/prop.c   |  1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client.c b/src/client.c
index 7406caf..4842eab 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1110,7 +1110,6 @@ manage(XCBWindow win, void *replies[ManageClientLAST])
     free(c);
     c = NULL;
 CLEANUP:
-    managecleanup(replies);
     return c;
 }
 
diff --git a/src/main.c b/src/main.c
index ac5cf76..2709c69 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1034,6 +1034,8 @@ scan(void)
             XCBGetWindowAttributes **replies = malloc(sizeof(XCBGetWindowAttributes *) * num);
             XCBGetWindowAttributes **replystates = malloc(sizeof(XCBGetWindowAttributes *) * num);
             XCBWindow *trans = malloc(sizeof(XCBWindow) * num);
+            uint64_t index;
+
 
             if(!wa || !wastates || !tfh || !managecookies || !managereplys || !replies || !replystates || !trans)
             {   
@@ -1054,11 +1056,11 @@ scan(void)
                 /* this specifically queries for the state which wa[i] might fail to provide */
                 wastates[i] = XCBGetWindowPropertyCookie(_wm.dpy, wins[i], wmatom[WMState], 0L, 2L, False, wmatom[WMState]);
                 tfh[i] = XCBGetTransientForHintCookie(_wm.dpy, wins[i]);
-                managerequest(wins[i], &managecookies[i * ManageClientLAST]);
+                index = i * ManageClientLAST;
+                managerequest(wins[i], managecookies + index);
             }
             
             uint8_t hastrans = 0;
-            uint64_t index;
             /* get them replies back */
             for(i = 0; i < num; ++i)
             {
@@ -1100,7 +1102,7 @@ scan(void)
                         index = ManageClientLAST * i;
                         /* technically we shouldnt have to do this but just in case */
                         if(!wintoclient(wins[i]))
-                        {   manage(wins[i], managereplys + i);
+                        {   manage(wins[i], managereplys + index);
                         }
                     }
                 }
@@ -1108,6 +1110,8 @@ scan(void)
             /* cleanup */
             for(i = 0; i < num; ++i)
             {
+                index = ManageClientLAST * i;
+                managecleanup(managereplys + index);
                 free(replies[i]);
                 free(replystates[i]);
             }
diff --git a/src/prop.c b/src/prop.c
index 50c1dd0..c511bdd 100644
--- a/src/prop.c
+++ b/src/prop.c
@@ -463,6 +463,7 @@ PropUpdateManage(
     }
     XCBFlush(_wm.dpy);
     UnlockMainThread();
+    managecleanup(replies);
 }
 
 void