Merge pull request #414 from btjones/static-analyzer-issues

ingorichter · ingorichter · commit d03b72812f6f · 2014-02-24T16:19:05.000-08:00
resolve (most) mac static analyzer issues
diff --git a/appshell/CustomTitlebarView.m b/appshell/CustomTitlebarView.m
@@ -68,6 +68,7 @@ - (void)drawRect:(NSRect)dirtyRect
 
     NSLayoutManager *lm = [[NSLayoutManager alloc] init];
     int             height = [lm defaultLineHeightForFont:titleFont];
+    [lm release];
 
     // Draw the title text
     if (stringWidth)
@@ -93,7 +94,10 @@ - (CGFloat)widthOfString:(NSString *)string withFont:(NSFont *)font
         return 0.0f;
     
     NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil];
-    return [[[NSAttributedString alloc] initWithString:string attributes:attributes] size].width;
+    NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:string attributes:attributes];
+    CGFloat stringWidth = [attributedString size].width;
+    [attributedString release];
+    return stringWidth;
 }
 
 #pragma mark Property accessors
diff --git a/appshell/FullScreenButton.mm b/appshell/FullScreenButton.mm
@@ -91,6 +91,7 @@ - (void)setup {
     NSTrackingArea *focusTrackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect
                                                                          options:focusTrackingAreaOptions owner:self userInfo:nil];
     [self addTrackingArea:focusTrackingArea];
+    [focusTrackingArea release];
 }
 
 - (void)mouseDown:(NSEvent *)theEvent {
diff --git a/appshell/appshell_extensions_mac.mm b/appshell/appshell_extensions_mac.mm
@@ -456,7 +456,7 @@ int32 IsNetworkDrive(ExtensionString path, bool& isRemote)
     }
 
     // Detect remote drive
-    NSString *testPath = [pathStr copy];
+    NSString *testPath = [[pathStr copy] autorelease];
     NSNumber *isVolumeKey;
     NSError *error = nil;
 
@@ -941,7 +941,7 @@ int32 getNewMenuPosition(CefRefPtr<CefBrowser> browser, NSMenu* menu, const Exte
 
 int32 AddMenu(CefRefPtr<CefBrowser> browser, ExtensionString itemTitle, ExtensionString command, ExtensionString position, ExtensionString relativeId) {
 
-    NSString* itemTitleStr = [[NSString alloc] initWithUTF8String:itemTitle.c_str()];
+    NSString* itemTitleStr = [[[NSString alloc] initWithUTF8String:itemTitle.c_str()] autorelease];
     NSMenuItem *testItem = nil;
     int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);
     if (tag == kTagNotFound) {
@@ -1051,7 +1051,7 @@ NSUInteger processKeyString(ExtensionString& key)
 
 // displayStr is not used on the mac
 int32 AddMenuItem(CefRefPtr<CefBrowser> browser, ExtensionString parentCommand, ExtensionString itemTitle, ExtensionString command, ExtensionString key, ExtensionString displayStr, ExtensionString position, ExtensionString relativeId) {
-    NSString* itemTitleStr = [[NSString alloc] initWithUTF8String:itemTitle.c_str()];
+    NSString* itemTitleStr = [[[NSString alloc] initWithUTF8String:itemTitle.c_str()] autorelease];
     NSMenuItem *testItem = nil;
     int32 parentTag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(parentCommand);
     bool isSeparator = (itemTitle == "---");
@@ -1090,9 +1090,9 @@ int32 AddMenuItem(CefRefPtr<CefBrowser> browser, ExtensionString parentCommand,
                 }
                 else {
                     NSUInteger mask = processKeyString(key);
-                    NSString* keyStr = [[NSString alloc] initWithUTF8String:key.c_str()];
+                    NSString* keyStr = [[[NSString alloc] initWithUTF8String:key.c_str()] autorelease];
                     keyStr = [keyStr lowercaseString];
-                    newItem = [NSMenuItem alloc];
+                    newItem = [[NSMenuItem alloc] autorelease];
                     [newItem setTitle:itemTitleStr];
                     [newItem setAction:NSSelectorFromString(@"handleMenuAction:")];
                     [newItem setKeyEquivalent:keyStr];
@@ -1138,7 +1138,7 @@ int32 GetMenuItemState(CefRefPtr<CefBrowser> browser, ExtensionString commandId,
 }
 
 int32 SetMenuTitle(CefRefPtr<CefBrowser> browser, ExtensionString command, ExtensionString itemTitle) {
-    NSString* itemTitleStr = [[NSString alloc] initWithUTF8String:itemTitle.c_str()];
+    NSString* itemTitleStr = [[[NSString alloc] initWithUTF8String:itemTitle.c_str()] autorelease];
     int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);
     if (tag == kTagNotFound) {
         return ERR_NOT_FOUND;
@@ -1193,7 +1193,7 @@ int32 SetMenuItemShortcut(CefRefPtr<CefBrowser> browser, ExtensionString command
     }
     
     NSUInteger mask = processKeyString(shortcut);
-    NSString* keyStr = [[NSString alloc] initWithUTF8String:shortcut.c_str()];
+    NSString* keyStr = [[[NSString alloc] initWithUTF8String:shortcut.c_str()] autorelease];
     keyStr = [keyStr lowercaseString];
     [item setKeyEquivalent:keyStr];
     [item setKeyEquivalentModifierMask:mask];
diff --git a/appshell/cefclient_mac.mm b/appshell/cefclient_mac.mm
@@ -153,7 +153,7 @@ - (void)setTrafficLightsView:(NSView*)view;
 
 @implementation ClientWindowDelegate
 - (id) init {
-    [super init];
+    self = [super init];
     isReallyClosing = NO;
     isReentering = NO;
     customTitlebar = nil;
@@ -307,7 +307,7 @@ -(void)initUI:(NSWindow*)mainWindow {
         windowButton = [mainWindow standardWindowButton:NSWindowZoomButton];
         [windowButton setHidden:YES];
         
-        TrafficLightsViewController     *tvController = [[TrafficLightsViewController alloc] init];
+        TrafficLightsViewController     *tvController = [[[TrafficLightsViewController alloc] init] autorelease];
         if ([NSBundle loadNibNamed: @"TrafficLights" owner: tvController])
         {
             NSRect oldFrame = [tvController.view frame];
@@ -327,7 +327,7 @@ -(void)initUI:(NSWindow*)mainWindow {
         windowButton = [mainWindow standardWindowButton:NSWindowFullScreenButton];
         [windowButton setHidden:YES];
         
-        FullScreenViewController     *fsController = [[FullScreenViewController alloc] init];
+        FullScreenViewController     *fsController = [[[FullScreenViewController alloc] init] autorelease];
         if ([NSBundle loadNibNamed: @"FullScreen" owner: fsController])
         {
             NSRect oldFrame = [fsController.view frame];
@@ -479,6 +479,14 @@ - (void)cleanup:(id)window {
 // BOBNOTE: Consider moving the AppDelegate interface into its own .h file
 // Receives notifications from the application. Will delete itself when done.
 @interface ClientAppDelegate : NSObject
+{
+    ClientWindowDelegate *delegate;
+    ClientMenuDelegate *menuDelegate;
+}
+
+@property (nonatomic, retain) ClientWindowDelegate *delegate;
+@property (nonatomic, retain) ClientMenuDelegate *menuDelegate;
+
 - (void)createApp:(id)object;
 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
 - (BOOL)application:(NSApplication *)theApplication openFiles:(NSArray *)filenames;
@@ -487,9 +495,10 @@ - (BOOL)application:(NSApplication *)theApplication openFiles:(NSArray *)filenam
 
 // BOBNOTE: Consider moving the AppDelegate implementation into its own .m file
 @implementation ClientAppDelegate
+@synthesize delegate, menuDelegate;
 
 - (id) init {
-  [super init];  
+  self = [super init];
   // Register our handler for the "handleOpenFileEvent" (a.k.a. OpFl) apple event.
   [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self
                                                      andSelector:@selector(handleOpenFileEvent:withReplyEvent:)
@@ -498,6 +507,12 @@ - (id) init {
   return self;
 }
 
+- (void)dealloc {
+    [self.delegate release];
+    [self.menuDelegate release];
+    [super dealloc];
+}
+
 // Create the application on the UI thread.
 - (void)createApp:(id)object {
   [NSApplication sharedApplication];
@@ -507,14 +522,14 @@ - (void)createApp:(id)object {
   [NSApp setDelegate:self];
   
   // Create the delegate for control and browser window events.
-  ClientWindowDelegate* delegate = [[ClientWindowDelegate alloc] init];
+  [self setDelegate:[[ClientWindowDelegate alloc] init]];
 
   // Create the delegate for menu events.
-  ClientMenuDelegate* menuDelegate = [[ClientMenuDelegate alloc] init];
+  [self setMenuDelegate:[[ClientMenuDelegate alloc] init]];
 
-  [[NSApp mainMenu] setDelegate:menuDelegate];
-  [[[[NSApp mainMenu] itemWithTag: BRACKETS_MENUITEMTAG] submenu] setDelegate:menuDelegate];
-  [[[[NSApp mainMenu] itemWithTag: WINDOW_MENUITEMTAG]   submenu] setDelegate:menuDelegate];
+  [[NSApp mainMenu] setDelegate:self.menuDelegate];
+  [[[[NSApp mainMenu] itemWithTag: BRACKETS_MENUITEMTAG] submenu] setDelegate:self.menuDelegate];
+  [[[[NSApp mainMenu] itemWithTag: WINDOW_MENUITEMTAG]   submenu] setDelegate:self.menuDelegate];
 
   // Create the main application window.
   NSUInteger styleMask = (NSTitledWindowMask |
@@ -571,7 +586,7 @@ - (void)createApp:(id)object {
 
   // Configure the rest of the window
   [mainWnd setTitle:WINDOW_TITLE];
-  [mainWnd setDelegate:delegate];
+  [mainWnd setDelegate:self.delegate];
   [mainWnd setCollectionBehavior: (1 << 7) /* NSWindowCollectionBehaviorFullScreenPrimary */];
 
   // Rely on the window delegate to clean us up rather than immediately
@@ -608,7 +623,7 @@ - (void)createApp:(id)object {
   CefBrowserHost::CreateBrowserSync(window_info, g_handler.get(),
                                 [str UTF8String], settings);
  
-  [delegate initUI:mainWnd];
+  [self.delegate initUI:mainWnd];
     
   // Show the window.
   [mainWnd display];
diff --git a/appshell/client_handler_mac.mm b/appshell/client_handler_mac.mm
@@ -118,7 +118,7 @@ - (void)initUI;
 @implementation PopupClientWindowDelegate
 
 - (id) init {
-  [super init];
+  self = [super init];
   isReallyClosing = NO;
   fullScreenButtonView = nil;
   customTitlebar = nil;
@@ -245,7 +245,7 @@ - (void)initUI {
         windowButton = [theWin standardWindowButton:NSWindowZoomButton];
         [windowButton setHidden:YES];
         
-        TrafficLightsViewController     *tlController = [[TrafficLightsViewController alloc] init];
+        TrafficLightsViewController     *tlController = [[[TrafficLightsViewController alloc] init] autorelease];
         
         if ([NSBundle loadNibNamed: @"TrafficLights" owner: tlController])
         {
@@ -266,7 +266,7 @@ - (void)initUI {
         windowButton = [theWin standardWindowButton:NSWindowFullScreenButton];
         [windowButton setHidden:YES];
         
-        FullScreenViewController     *fsController = [[FullScreenViewController alloc] init];
+        FullScreenViewController     *fsController = [[[FullScreenViewController alloc] init] autorelease];
         if ([NSBundle loadNibNamed: @"FullScreen" owner: fsController])
         {
             NSRect oldFrame = [fsController.view frame];

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ - (void)setup {`
`91`	`91`	`NSTrackingArea *focusTrackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect`
`92`	`92`	`options:focusTrackingAreaOptions owner:self userInfo:nil];`
`93`	`93`	`[self addTrackingArea:focusTrackingArea];`
	`94`	`+ [focusTrackingArea release];`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`- (void)mouseDown:(NSEvent *)theEvent {`