Fixed long-time memory leak when moving/resizing a window in toggle.c (…

…#427)
DerjenigeUberMensch · Sep 12, 2024 · 6ab55a2 · 6ab55a2
1 parent 9455757
commit 6ab55a2
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/toggle.c b/src/toggle.c
@@ -224,17 +224,12 @@ DragWindow(
     XCBGrabPointer *GrabPointer = XCBGrabPointerReply(_wm.dpy, GrabPointerCookie);
 
     /* FIXME this looks horrible */
-    if(GrabPointer)
-    {
-        if(GrabPointer->status != XCB_GRAB_STATUS_SUCCESS)
-        {   free(GrabPointer);
-            return;
-        }
+    if(!GrabPointer || GrabPointer->status != XCB_GRAB_STATUS_SUCCESS)
+    {   
         free(GrabPointer);
+        return;
     }
-    else
-    {   return;
-    }
+    free(GrabPointer);
 
     XCBCookie QueryPointerCookie = XCBQueryPointerCookie(_wm.dpy, win);
     XCBQueryPointer *pointer = XCBQueryPointerReply(_wm.dpy, QueryPointerCookie);
@@ -306,7 +301,7 @@ DragWindow(
                     if(_cfg.refreshrate)
                     {
                         if((mev->time - lasttime) <= FRAME_TIME)
-                        {   continue;
+                        {   break;
                         }
                         lasttime = mev->time;
                     }
@@ -531,6 +526,7 @@ ResizeWindow(const Arg *arg)
     {   free(GrabPointer);
         return;
     }
+    free(GrabPointer);
     /* Prevent it from being detected as non floating */
     if(c)
     {
@@ -558,7 +554,7 @@ ResizeWindow(const Arg *arg)
                     if(_cfg.refreshrate)
                     {
                         if((mev->time - lasttime) <= FRAME_TIME)
-                        {   continue;
+                        {   break;
                         }
                         lasttime = mev->time;
                     }