Title: [93021] trunk/Source/WebCore
Revision
93021
Author
[email protected]
Date
2011-08-13 11:51:05 -0700 (Sat, 13 Aug 2011)

Log Message

Fix incorrect objective-c initialize in WebCore
https://bugs.webkit.org/show_bug.cgi?id=66191

Reviewed by David Kilzer.

* accessibility/mac/AccessibilityObjectWrapper.mm:
(-[AccessibilityObjectWrapper initWithAccessibilityObject:]):
* rendering/RenderThemeMac.mm:
(-[WebCoreRenderThemeNotificationObserver initWithTheme:WebCore::]):
Correctly initialize by assigning to self and nil checking the result.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (93020 => 93021)


--- trunk/Source/WebCore/ChangeLog	2011-08-13 18:31:43 UTC (rev 93020)
+++ trunk/Source/WebCore/ChangeLog	2011-08-13 18:51:05 UTC (rev 93021)
@@ -1,3 +1,16 @@
+2011-08-13  Sam Weinig  <[email protected]>
+
+        Fix incorrect objective-c initialize in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=66191
+
+        Reviewed by David Kilzer.
+
+        * accessibility/mac/AccessibilityObjectWrapper.mm:
+        (-[AccessibilityObjectWrapper initWithAccessibilityObject:]):
+        * rendering/RenderThemeMac.mm:
+        (-[WebCoreRenderThemeNotificationObserver initWithTheme:WebCore::]):
+        Correctly initialize by assigning to self and nil checking the result.
+
 2011-08-13  Adam Barth  <[email protected]>
 
         Fix clang build.

Modified: trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm (93020 => 93021)


--- trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm	2011-08-13 18:31:43 UTC (rev 93020)
+++ trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm	2011-08-13 18:51:05 UTC (rev 93021)
@@ -338,7 +338,8 @@
 
 - (id)initWithAccessibilityObject:(AccessibilityObject*)axObject
 {
-    [super init];
+    if (!(self = [super init]))
+        return nil;
 
     m_object = axObject;
     return self;

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (93020 => 93021)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2011-08-13 18:31:43 UTC (rev 93020)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2011-08-13 18:51:05 UTC (rev 93021)
@@ -88,9 +88,10 @@
 
 - (id)initWithTheme:(WebCore::RenderTheme *)theme
 {
-    [super init];
-    _theme = theme;
-    
+    if (!(self = [super init]))
+        return nil;
+
+    _theme = theme;    
     return self;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to