Attachment 371313 Details for Bug 198538 – Patch v1

[patch] Patch v1

bug-198538-20190604115630.patch (text/plain), 2.14 KB, created by David Kilzer (:ddkilzer) on 2019-06-04 11:56:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2019-06-04 11:56:31 PDT

Size: 2.14 KB

patch

obsolete

>Subversion Revision: 246042
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e016c827404876443c47f0fde4514806b0b2db3b..6fab289822f83bd3bcbd1030e9b6faf6c61640d9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-04  David Kilzer  <ddkilzer@apple.com>
>+
>+        REGRESSION (r244557): Leak of WKNSString in WTR::runOpenPanel() while running WebKit layout tests
>+        <https://webkit.org/b/198538>
>+        <rdar://problem/51407719>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::runOpenPanel): Use adoptWK() to fix the leak.
>+
> 2019-06-03  Timothy Hatcher  <timothy@apple.com>
> 
>         Tweak the text and underline color for data detected text.
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 26a01acd7974bc1876107b790a7b3adc87a3441d..18b8b1e2428da71970ae61f1f057b3aaa15ceaab 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -204,16 +204,16 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters
>     WKTypeRef firstItem = WKArrayGetItemAtIndex(fileURLs, 0);
>     
> #if PLATFORM(IOS_FAMILY)
>-    WKStringRef displayString = WKURLCopyLastPathComponent(static_cast<WKURLRef>(firstItem));
>+    auto displayString = adoptWK(WKURLCopyLastPathComponent(static_cast<WKURLRef>(firstItem)));
>     WKDataRef mediaIcon = TestController::singleton().openPanelFileURLsMediaIcon();
>     
>     if (mediaIcon) {
>         if (WKOpenPanelParametersGetAllowsMultipleFiles(parameters)) {
>-            WKOpenPanelResultListenerChooseMediaFiles(resultListenerRef, fileURLs, displayString, mediaIcon);
>+            WKOpenPanelResultListenerChooseMediaFiles(resultListenerRef, fileURLs, displayString.get(), mediaIcon);
>             return;
>         }
>         
>-        WKOpenPanelResultListenerChooseMediaFiles(resultListenerRef, adoptWK(WKArrayCreate(&firstItem, 1)).get(), displayString, mediaIcon);
>+        WKOpenPanelResultListenerChooseMediaFiles(resultListenerRef, adoptWK(WKArrayCreate(&firstItem, 1)).get(), displayString.get(), mediaIcon);
>         return;
>     }
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 198538: 371313