Title: [237667] trunk/Source/WebKit
Revision
237667
Author
wenson_hs...@apple.com
Date
2018-10-31 19:11:21 -0700 (Wed, 31 Oct 2018)

Log Message

API test WKAttachmentTests.CopyAndPasteBetweenWebViews fails on macOS 10.13
https://bugs.webkit.org/show_bug.cgi?id=191114
<rdar://problem/45700410>

Reviewed by Dean Jackson.

Followup to r237648: also make sure that we insecurely unarchive NSFileWrapper on platforms that don't support
secure archiving of file wrappers.

* UIProcess/API/Cocoa/APIAttachmentCocoa.mm:
(API::Attachment::updateFromSerializedRepresentation):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (237666 => 237667)


--- trunk/Source/WebKit/ChangeLog	2018-11-01 01:18:46 UTC (rev 237666)
+++ trunk/Source/WebKit/ChangeLog	2018-11-01 02:11:21 UTC (rev 237667)
@@ -1,3 +1,17 @@
+2018-10-31  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        API test WKAttachmentTests.CopyAndPasteBetweenWebViews fails on macOS 10.13
+        https://bugs.webkit.org/show_bug.cgi?id=191114
+        <rdar://problem/45700410>
+
+        Reviewed by Dean Jackson.
+
+        Followup to r237648: also make sure that we insecurely unarchive NSFileWrapper on platforms that don't support
+        secure archiving of file wrappers.
+
+        * UIProcess/API/Cocoa/APIAttachmentCocoa.mm:
+        (API::Attachment::updateFromSerializedRepresentation):
+
 2018-10-31  Dean Jackson  <d...@apple.com>
 
         Forward original fragment identifier into System Preview

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm (237666 => 237667)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm	2018-11-01 01:18:46 UTC (rev 237666)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm	2018-11-01 02:11:21 UTC (rev 237667)
@@ -155,8 +155,13 @@
     if (!serializedData)
         return;
 
+#if CAN_SECURELY_ARCHIVE_FILE_WRAPPER
     NSFileWrapper *fileWrapper = unarchivedObjectOfClassesFromData(m_webPage->pageClient().serializableFileWrapperClasses(), serializedData.get());
-    if (!fileWrapper)
+#else
+    NSFileWrapper *fileWrapper = insecurelyUnarchiveObjectFromData(serializedData.get());
+#endif
+
+    if (![fileWrapper isKindOfClass:NSFileWrapper.class])
         return;
 
     setFileWrapperAndUpdateContentType(fileWrapper, contentType);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to