Title: [222080] trunk
Revision
222080
Author
[email protected]
Date
2017-09-15 02:20:14 -0700 (Fri, 15 Sep 2017)

Log Message

iOS: WebKitTestRunner hits an assertion in editing/pasteboard/datatransfer-items-copy-plaintext.html
https://bugs.webkit.org/show_bug.cgi?id=176968
Source/WebKit:

Reviewed by Wenson Hsieh.

Don't allocate a SharedMemory of size zero (content was empty) as this would result in a crash inside
a WebContent process in release builds and an assertion failure in debug builds.

* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
(WebKit::WebPasteboardProxy::readBufferFromPasteboard):

LayoutTests:

<rdar://problem/34454843>

Reviewed by Wenson Hsieh.

Unskip the test which used to crash/hit assertions.

* platform/ios/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (222079 => 222080)


--- trunk/LayoutTests/ChangeLog	2017-09-15 07:43:26 UTC (rev 222079)
+++ trunk/LayoutTests/ChangeLog	2017-09-15 09:20:14 UTC (rev 222080)
@@ -1,3 +1,15 @@
+2017-09-15  Ryosuke Niwa  <[email protected]>
+
+        iOS: WebKitTestRunner hits an assertion in editing/pasteboard/datatransfer-items-copy-plaintext.html
+        https://bugs.webkit.org/show_bug.cgi?id=176968
+        <rdar://problem/34454843>
+
+        Reviewed by Wenson Hsieh.
+
+        Unskip the test which used to crash/hit assertions.
+
+        * platform/ios/TestExpectations:
+
 2017-09-15  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed GTK+ gardening. Rebaseline tests after r222077. Part 2.

Modified: trunk/LayoutTests/platform/ios/TestExpectations (222079 => 222080)


--- trunk/LayoutTests/platform/ios/TestExpectations	2017-09-15 07:43:26 UTC (rev 222079)
+++ trunk/LayoutTests/platform/ios/TestExpectations	2017-09-15 09:20:14 UTC (rev 222080)
@@ -2237,8 +2237,8 @@
 editing/pasteboard/data-transfer-items.html [ Failure ]
 editing/pasteboard/dataTransfer-setData-getData.html [ Failure ]
 editing/pasteboard/datatransfer-getdata-plaintext.html [ Failure ]
-editing/pasteboard/datatransfer-items-copy-plaintext.html [ Skip ]
-editing/pasteboard/datatransfer-items-paste-plaintext.html [ Skip ]
+editing/pasteboard/datatransfer-items-copy-plaintext.html [ Failure ]
+editing/pasteboard/datatransfer-items-paste-plaintext.html [ Failure ]
 editing/pasteboard/display-block-on-spans.html [ Failure ]
 editing/pasteboard/emacs-ctrl-k-with-move.html [ Failure ]
 editing/pasteboard/emacs-ctrl-k-y-001.html [ Failure ]

Modified: trunk/Source/WebKit/ChangeLog (222079 => 222080)


--- trunk/Source/WebKit/ChangeLog	2017-09-15 07:43:26 UTC (rev 222079)
+++ trunk/Source/WebKit/ChangeLog	2017-09-15 09:20:14 UTC (rev 222080)
@@ -1,3 +1,16 @@
+2017-09-15  Ryosuke Niwa  <[email protected]>
+
+        iOS: WebKitTestRunner hits an assertion in editing/pasteboard/datatransfer-items-copy-plaintext.html
+        https://bugs.webkit.org/show_bug.cgi?id=176968
+
+        Reviewed by Wenson Hsieh.
+
+        Don't allocate a SharedMemory of size zero (content was empty) as this would result in a crash inside
+        a WebContent process in release builds and an assertion failure in debug builds.
+
+        * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+        (WebKit::WebPasteboardProxy::readBufferFromPasteboard):
+
 2017-09-14  Youenn Fablet  <[email protected]>
 
         Add Cache API support of records persistency

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (222079 => 222080)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2017-09-15 07:43:26 UTC (rev 222079)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2017-09-15 09:20:14 UTC (rev 222080)
@@ -181,6 +181,8 @@
     if (!buffer)
         return;
     size = buffer->size();
+    if (!size)
+        return;
     RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(size);
     if (!sharedMemoryBuffer)
         return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to