adium/adium

Fix some memory issues.

2013-06-25, Frank Dowsett
51f0fe2d35a2
Parents 551c610ece99
Children d95e88e9cbfa
Fix some memory issues.
5 files changed, 13 insertions(+), 5 deletions(-)
  • +1 -1
    Plugins/Link Management/SHAutoValidatingTextView.m
  • +3 -0
    Source/AIAppearancePreferences.m
  • +4 -4
    Source/AILogViewerWindowController.m
  • +2 -0
    Source/AIPreferenceWindowController.m
  • +3 -0
    Source/ESContactListAdvancedPreferences.m
    • --- a/Plugins/Link Management/SHAutoValidatingTextView.m Tue Jun 25 10:04:55 2013 +0200
    +++ b/Plugins/Link Management/SHAutoValidatingTextView.m Tue Jun 25 22:50:17 2013 -0400
    @@ -126,7 +126,7 @@
    escapedURLString = nil;
    }
    - return (escapedURLString ? (__bridge NSString *)escapedURLString : linkURL);
    + return (escapedURLString ? (__bridge_transfer NSString *)escapedURLString : linkURL);
    }
    @end
    --- a/Source/AIAppearancePreferences.m Tue Jun 25 10:04:55 2013 +0200
    +++ b/Source/AIAppearancePreferences.m Tue Jun 25 22:50:17 2013 -0400
    @@ -138,6 +138,9 @@
    if (!type || UTTypeEqual(type, CFSTR("com.adiumx.menubaricons"))) {
    [self configureMenuBarIconsMenu];
    }
    +
    + if (type)
    + CFRelease(type);
    }
    /*!
    --- a/Source/AILogViewerWindowController.m Tue Jun 25 10:04:55 2013 +0200
    +++ b/Source/AILogViewerWindowController.m Tue Jun 25 22:50:17 2013 -0400
    @@ -2585,7 +2585,7 @@
    - (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
    {
    - NSArray *selectedLogs = (__bridge NSArray *)contextInfo;
    + NSArray *selectedLogs = (__bridge_transfer NSArray *)contextInfo;
    if (returnCode == NSAlertFirstButtonReturn) {
    [resultsLock lock];
    @@ -2653,7 +2653,7 @@
    } else if ([selectedLogs count] == 1) {
    [self deleteLogsAlertDidEnd:nil
    returnCode:NSAlertFirstButtonReturn
    - contextInfo:(__bridge_retained void *)(selectedLogs)];
    + contextInfo:(__bridge void *)(selectedLogs)];
    }
    }
    @@ -2721,7 +2721,7 @@
    - (void)deleteSelectedContactsFromSourceListAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
    {
    - NSArray *allSelectedToGroups = (__bridge NSArray *)contextInfo;
    + NSArray *allSelectedToGroups = (__bridge_transfer NSArray *)contextInfo;
    if (returnCode == NSAlertFirstButtonReturn) {
    AILogToGroup *logToGroup;
    NSMutableSet *logPaths = [NSMutableSet set];
    @@ -2769,7 +2769,7 @@
    } else {
    [self deleteSelectedContactsFromSourceListAlertDidEnd:nil
    returnCode:NSAlertFirstButtonReturn
    - contextInfo:(__bridge_retained void *)(allSelectedToGroups)];
    + contextInfo:(__bridge void *)(allSelectedToGroups)];
    }
    }
    --- a/Source/AIPreferenceWindowController.m Tue Jun 25 10:04:55 2013 +0200
    +++ b/Source/AIPreferenceWindowController.m Tue Jun 25 22:50:17 2013 -0400
    @@ -199,6 +199,7 @@
    doc,
    (__bridge CFStringRef)contents,
    NO);
    + CFRelease(doc);
    }];
    }];
    }
    @@ -218,6 +219,7 @@
    doc,
    (__bridge CFStringRef)paneName,
    NO);
    + CFRelease(doc);
    };
    [generalPaneArray enumerateObjectsUsingBlock:_skPaneNames];
    [appearancePaneArray enumerateObjectsUsingBlock:_skPaneNames];
    --- a/Source/ESContactListAdvancedPreferences.m Tue Jun 25 10:04:55 2013 +0200
    +++ b/Source/ESContactListAdvancedPreferences.m Tue Jun 25 22:50:17 2013 -0400
    @@ -136,6 +136,9 @@
    [popUp_listLayout selectItemWithRepresentedObject:[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME
    group:PREF_GROUP_APPEARANCE]];
    }
    +
    + if (type)
    + CFRelease(type);
    }
    /*!