Fix two memory leaks in hs.application and one in hs.window

Hammerspoon · Jul 12, 2018 · 6608ec6 · 6608ec6
1 parent 24cca61
commit 6608ec6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/extensions/application/internal.m b/extensions/application/internal.m
@@ -623,7 +623,7 @@ AXUIElementRef _findmenuitembyname(lua_State* L, AXUIElementRef app, NSString *n
                 [skin logBreadcrumb:[NSString stringWithFormat:@"Got an error (%d) fetching menu children, skipping", (int)error]];
                 continue;
             }
-            [toCheck addObjectsFromArray:(__bridge NSArray *)cf_menuchildren];
+            [toCheck addObjectsFromArray:(__bridge_transfer NSArray *)cf_menuchildren];
         } else if (childcount == 0) {
             // This doesn't seem to be a submenu, so see if it's a match
             if (!nameIsRegex && [name isEqualToString:title]) {
@@ -745,6 +745,7 @@ AXUIElementRef _findmenuitembypath(lua_State* L __unused, AXUIElementRef app, NS
                 break;
             }
         }
+        CFRelease(cf_children);
 
         if (!found) {
             [skin logBreadcrumb:@"Unable to resolve complete search path"];

diff --git a/extensions/window/internal.m b/extensions/window/internal.m
@@ -160,6 +160,7 @@ static BOOL window_presstab(AXUIElementRef win, CFIndex tabIndex) {
     worked = YES;
 cleanup:
     if (tabs) CFRelease(tabs);
+    if (children) CFRelease(children);
 
     return worked;
 }