Plug leak in _createDockMenu:

jslegendre · Nov 5, 2020 · 9c3eddd · 9c3eddd
1 parent 1539270
commit 9c3eddd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/AfloatX/AfloatX.m b/AfloatX/AfloatX.m
@@ -282,11 +282,17 @@ - (CFArrayRef)_createDockMenu:(BOOL)enabled {
         [invertColorItem setState:NSControlStateValueOff];
     }
 
+    CFMutableArrayRef finalMenu = CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks);
+
     CFArrayRef flatDockMenu = ZKOrig(CFArrayRef, enabled);
+    CFArrayAppendArray(finalMenu, flatDockMenu, CFRangeMake(0, CFArrayGetCount(flatDockMenu)));
+    CFRelease(flatDockMenu);
+
     CFArrayRef flatAfloatXMenu = (__bridge CFArrayRef)(objc_msgSend(self, sel_getUid("_flattenMenu:flatList:"), AfloatXMenu, nil));
 
-    NSMutableArray *combinedFlatMenus = (__bridge NSMutableArray *)flatDockMenu;
-    [combinedFlatMenus addObjectsFromArray:(__bridge NSArray *)flatAfloatXMenu];
-    return (__bridge CFArrayRef)combinedFlatMenus;
+    CFArrayAppendArray(finalMenu, flatAfloatXMenu, CFRangeMake(0, CFArrayGetCount(flatAfloatXMenu)));
+    CFRelease(flatAfloatXMenu);
+
+    return finalMenu;
 }
 @end