Changeset 244703 in webkit

Timestamp:

Apr 26, 2019 11:32:46 AM (5 years ago)

Author:

ddkilzer@apple.com

Message:

WebKitTestRunner leaks an NSDictionary and multiple JSStringRef objects
<​https://webkit.org/b/197314>
<rdar://problem/50245252>

Reviewed by Simon Fraser.

• WebKitTestRunner/UIScriptControllerCocoa.mm:

(WTR::UIScriptController::lastUndoLabel const):
(WTR::UIScriptController::firstRedoLabel const):

• Use adopt(JSStringCreateWithCFString(...)) to fix leaks.

• WebKitTestRunner/ios/HIDEventGenerator.mm:

(-[HIDEventGenerator sendEventStream:completionBlock:]):

• Call -autorelease to fix leak of NSDictionary.

• WebKitTestRunner/ios/UIScriptControllerIOS.mm:

(WTR::UIScriptController::accessibilitySpeakSelectionContent const):
(WTR::UIScriptController::selectFormPopoverTitle const):
(WTR::UIScriptController::textContentType const):
(WTR::UIScriptController::formInputLabel const):
(WTR::UIScriptController::scrollingTreeAsText const):

• Use adopt(JSStringCreateWithCFString(...)) to fix leaks.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/UIScriptControllerCocoa.mm (modified) (1 diff)
• WebKitTestRunner/ios/HIDEventGenerator.mm (modified) (1 diff)
• WebKitTestRunner/ios/UIScriptControllerIOS.mm (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-26  David Kilzer  <ddkilzer@apple.com>
+
+        WebKitTestRunner leaks an NSDictionary and multiple JSStringRef objects
+        <https://webkit.org/b/197314>
+        <rdar://problem/50245252>
+
+        Reviewed by Simon Fraser.
+
+        * WebKitTestRunner/UIScriptControllerCocoa.mm:
+        (WTR::UIScriptController::lastUndoLabel const):
+        (WTR::UIScriptController::firstRedoLabel const):
+        - Use adopt(JSStringCreateWithCFString(...)) to fix leaks.
+
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (-[HIDEventGenerator sendEventStream:completionBlock:]):
+        - Call -autorelease to fix leak of NSDictionary.
+
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptController::accessibilitySpeakSelectionContent const):
+        (WTR::UIScriptController::selectFormPopoverTitle const):
+        (WTR::UIScriptController::textContentType const):
+        (WTR::UIScriptController::formInputLabel const):
+        (WTR::UIScriptController::scrollingTreeAsText const):
+        - Use adopt(JSStringCreateWithCFString(...)) to fix leaks.
+
 2019-04-26  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm

@@ -152 +152 @@
 JSRetainPtr<JSStringRef> UIScriptController::lastUndoLabel() const
 {
-    return JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().undoActionName);
+    return adopt(JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().undoActionName));
 }
 
 JSRetainPtr<JSStringRef> UIScriptController::firstRedoLabel() const
 {
-    return JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().redoActionName);
+    return adopt(JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().redoActionName));
 }
 

trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

@@ -1139 +1139 @@
     
     NSDictionary* threadData = @{
-        @"eventInfo": [eventInfo copy],
+        @"eventInfo": [[eventInfo copy] autorelease],
         @"completionBlock": [[completionBlock copy] autorelease]
     };

trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm

@@ -199 +199 @@
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    return JSStringCreateWithCFString((CFStringRef)webView.accessibilitySpeakSelectionContent);
+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.accessibilitySpeakSelectionContent));
 }
 
@@ -500 +500 @@
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    return JSStringCreateWithCFString((CFStringRef)webView.selectFormPopoverTitle);
+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.selectFormPopoverTitle));
 }
 
@@ -506 +506 @@
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    return JSStringCreateWithCFString((CFStringRef)(webView.textContentTypeForTesting ?: @""));
+    return adopt(JSStringCreateWithCFString((CFStringRef)(webView.textContentTypeForTesting ?: @"")));
 }
 
@@ -512 +512 @@
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    return JSStringCreateWithCFString((CFStringRef)webView.formInputLabel);
+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.formInputLabel));
 }
 
@@ -752 +752 @@
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    return JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]);
+    return adopt(JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]));
 }