Title: [290909] branches/safari-613-branch/Source
Revision
290909
Author
[email protected]
Date
2022-03-07 14:08:34 -0800 (Mon, 07 Mar 2022)

Log Message

Cherry-pick r287986. rdar://problem/87489048

    Fix a few Objective-C object leaks due to early returns in `init`
    https://bugs.webkit.org/show_bug.cgi?id=235162
    <rdar://problem/87489048>

    Reviewed by Wenson Hsieh.

    Source/_javascript_Core:

    * API/JSValue.mm:
    (-[JSValue initWithValue:inContext:]):

    Source/WebCore:

    * platform/ios/WebAVPlayerController.mm:
    (-[WebAVPlayerController init]):

    Source/WebKit:

    * UIProcess/ios/WKHoverPlatter.mm:
    (-[WKHoverPlatter initWithView:delegate:]):

    Source/WebKitLegacy/mac:

    * Storage/WebDatabaseQuotaManager.mm:
    (WebCore::if):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-613-branch/Source/_javascript_Core/API/JSValue.mm (290908 => 290909)


--- branches/safari-613-branch/Source/_javascript_Core/API/JSValue.mm	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/_javascript_Core/API/JSValue.mm	2022-03-07 22:08:34 UTC (rev 290909)
@@ -1108,8 +1108,10 @@
 
 - (JSValue *)initWithValue:(JSValueRef)value inContext:(JSContext *)context
 {
-    if (!value || !context)
+    if (!value || !context) {
+        [self release];
         return nil;
+    }
 
     self = [super init];
     if (!self)

Modified: branches/safari-613-branch/Source/_javascript_Core/ChangeLog (290908 => 290909)


--- branches/safari-613-branch/Source/_javascript_Core/ChangeLog	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/_javascript_Core/ChangeLog	2022-03-07 22:08:34 UTC (rev 290909)
@@ -1,3 +1,47 @@
+2022-03-07  Russell Epstein  <[email protected]>
+
+        Cherry-pick r287986. rdar://problem/87489048
+
+    Fix a few Objective-C object leaks due to early returns in `init`
+    https://bugs.webkit.org/show_bug.cgi?id=235162
+    <rdar://problem/87489048>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/_javascript_Core:
+    
+    * API/JSValue.mm:
+    (-[JSValue initWithValue:inContext:]):
+    
+    Source/WebCore:
+    
+    * platform/ios/WebAVPlayerController.mm:
+    (-[WebAVPlayerController init]):
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKHoverPlatter.mm:
+    (-[WKHoverPlatter initWithView:delegate:]):
+    
+    Source/WebKitLegacy/mac:
+    
+    * Storage/WebDatabaseQuotaManager.mm:
+    (WebCore::if):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-13  Tim Horton  <[email protected]>
+
+            Fix a few Objective-C object leaks due to early returns in `init`
+            https://bugs.webkit.org/show_bug.cgi?id=235162
+            <rdar://problem/87489048>
+
+            Reviewed by Wenson Hsieh.
+
+            * API/JSValue.mm:
+            (-[JSValue initWithValue:inContext:]):
+
 2022-03-03  Russell Epstein  <[email protected]>
 
         Cherry-pick r288363. rdar://problem/88995092

Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (290908 => 290909)


--- branches/safari-613-branch/Source/WebCore/ChangeLog	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog	2022-03-07 22:08:34 UTC (rev 290909)
@@ -1,3 +1,47 @@
+2022-03-07  Russell Epstein  <[email protected]>
+
+        Cherry-pick r287986. rdar://problem/87489048
+
+    Fix a few Objective-C object leaks due to early returns in `init`
+    https://bugs.webkit.org/show_bug.cgi?id=235162
+    <rdar://problem/87489048>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/_javascript_Core:
+    
+    * API/JSValue.mm:
+    (-[JSValue initWithValue:inContext:]):
+    
+    Source/WebCore:
+    
+    * platform/ios/WebAVPlayerController.mm:
+    (-[WebAVPlayerController init]):
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKHoverPlatter.mm:
+    (-[WKHoverPlatter initWithView:delegate:]):
+    
+    Source/WebKitLegacy/mac:
+    
+    * Storage/WebDatabaseQuotaManager.mm:
+    (WebCore::if):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-13  Tim Horton  <[email protected]>
+
+            Fix a few Objective-C object leaks due to early returns in `init`
+            https://bugs.webkit.org/show_bug.cgi?id=235162
+            <rdar://problem/87489048>
+
+            Reviewed by Wenson Hsieh.
+
+            * platform/ios/WebAVPlayerController.mm:
+            (-[WebAVPlayerController init]):
+
 2022-03-01  Russell Epstein  <[email protected]>
 
         Cherry-pick r290512. rdar://problem/86582214

Modified: branches/safari-613-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm (290908 => 290909)


--- branches/safari-613-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm	2022-03-07 22:08:34 UTC (rev 290909)
@@ -66,8 +66,10 @@
 
 - (instancetype)init
 {
-    if (!getAVPlayerControllerClass())
+    if (!getAVPlayerControllerClass()) {
+        [self release];
         return nil;
+    }
 
     if (!(self = [super init]))
         return self;

Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (290908 => 290909)


--- branches/safari-613-branch/Source/WebKit/ChangeLog	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog	2022-03-07 22:08:34 UTC (rev 290909)
@@ -1,3 +1,47 @@
+2022-03-07  Russell Epstein  <[email protected]>
+
+        Cherry-pick r287986. rdar://problem/87489048
+
+    Fix a few Objective-C object leaks due to early returns in `init`
+    https://bugs.webkit.org/show_bug.cgi?id=235162
+    <rdar://problem/87489048>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/_javascript_Core:
+    
+    * API/JSValue.mm:
+    (-[JSValue initWithValue:inContext:]):
+    
+    Source/WebCore:
+    
+    * platform/ios/WebAVPlayerController.mm:
+    (-[WebAVPlayerController init]):
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKHoverPlatter.mm:
+    (-[WKHoverPlatter initWithView:delegate:]):
+    
+    Source/WebKitLegacy/mac:
+    
+    * Storage/WebDatabaseQuotaManager.mm:
+    (WebCore::if):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-13  Tim Horton  <[email protected]>
+
+            Fix a few Objective-C object leaks due to early returns in `init`
+            https://bugs.webkit.org/show_bug.cgi?id=235162
+            <rdar://problem/87489048>
+
+            Reviewed by Wenson Hsieh.
+
+            * UIProcess/ios/WKHoverPlatter.mm:
+            (-[WKHoverPlatter initWithView:delegate:]):
+
 2022-03-01  Russell Epstein  <[email protected]>
 
         Revert r289282. rdar://problem/88876661

Modified: branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKHoverPlatter.mm (290908 => 290909)


--- branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKHoverPlatter.mm	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKHoverPlatter.mm	2022-03-07 22:08:34 UTC (rev 290909)
@@ -93,8 +93,10 @@
 - (instancetype)initWithView:(UIView *)view delegate:(id <WKHoverPlatterDelegate>)delegate
 {
     auto parameters = WKHoverPlatterDomain.rootSettings;
-    if (!parameters.platterEnabledForMouse && !parameters.platterEnabledForHover)
+    if (!parameters.platterEnabledForMouse && !parameters.platterEnabledForHover) {
+        [self release];
         return nil;
+    }
 
     self = [super init];
     if (!self)

Modified: branches/safari-613-branch/Source/WebKitLegacy/mac/ChangeLog (290908 => 290909)


--- branches/safari-613-branch/Source/WebKitLegacy/mac/ChangeLog	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebKitLegacy/mac/ChangeLog	2022-03-07 22:08:34 UTC (rev 290909)
@@ -1,3 +1,47 @@
+2022-03-07  Russell Epstein  <[email protected]>
+
+        Cherry-pick r287986. rdar://problem/87489048
+
+    Fix a few Objective-C object leaks due to early returns in `init`
+    https://bugs.webkit.org/show_bug.cgi?id=235162
+    <rdar://problem/87489048>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/_javascript_Core:
+    
+    * API/JSValue.mm:
+    (-[JSValue initWithValue:inContext:]):
+    
+    Source/WebCore:
+    
+    * platform/ios/WebAVPlayerController.mm:
+    (-[WebAVPlayerController init]):
+    
+    Source/WebKit:
+    
+    * UIProcess/ios/WKHoverPlatter.mm:
+    (-[WKHoverPlatter initWithView:delegate:]):
+    
+    Source/WebKitLegacy/mac:
+    
+    * Storage/WebDatabaseQuotaManager.mm:
+    (WebCore::if):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-13  Tim Horton  <[email protected]>
+
+            Fix a few Objective-C object leaks due to early returns in `init`
+            https://bugs.webkit.org/show_bug.cgi?id=235162
+            <rdar://problem/87489048>
+
+            Reviewed by Wenson Hsieh.
+
+            * Storage/WebDatabaseQuotaManager.mm:
+            (WebCore::if):
+
 2022-03-01  Russell Epstein  <[email protected]>
 
         Cherry-pick r290005. rdar://problem/87596724

Modified: branches/safari-613-branch/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.mm (290908 => 290909)


--- branches/safari-613-branch/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.mm	2022-03-07 22:08:28 UTC (rev 290908)
+++ branches/safari-613-branch/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.mm	2022-03-07 22:08:34 UTC (rev 290909)
@@ -35,8 +35,10 @@
 
 - (id)initWithOrigin:(WebSecurityOrigin *)origin
 {
-    if (!origin)
+    if (!origin) {
+        [self release];
         return nil;
+    }
 
     self = [super init];
     if (!self)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to