Changeset 226248 in webkit

Timestamp:

Dec 21, 2017 3:57:56 PM (6 years ago)

Author:

Brent Fulgham

Message:

Unreviewed test fix after r226224.
<rdar://problem/36185975>

Pasteboard data is more than a dictionary. We have to whitelist NSString
and NSArray as well. Change method name to reflect that we take a whitelist
of classes that are allowed to be unarchived in the call.
Source/WebCore:

• platform/ios/PlatformPasteboardIOS.mm:

(WebCore::PlatformPasteboard::write): Use revised method.
(WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const): Ditto.

Source/WebCore/PAL:

• pal/spi/cocoa/NSKeyedArchiverSPI.h:

(unarchivedObjectOfClassesFromData):
(unarchivedObjectOfClassFromData): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h (modified) (1 diff)
• platform/ios/PlatformPasteboardIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-21  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed test fix after r226224.
+        <rdar://problem/36185975>
+
+        Pasteboard data is more than a dictionary. We have to whitelist NSString
+        and NSArray as well. Change method name to reflect that we take a whitelist
+        of classes that are allowed to be unarchived in the call.
+
+        * platform/ios/PlatformPasteboardIOS.mm:
+        (WebCore::PlatformPasteboard::write): Use revised method.
+        (WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const): Ditto.
+
 2017-12-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2017-12-21  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed test fix after r226224.
+        <rdar://problem/36185975>
+
+        Pasteboard data is more than a dictionary. We have to whitelist NSString
+        and NSArray as well. Change method name to reflect that we take a whitelist
+        of classes that are allowed to be unarchived in the call.
+        
+        * pal/spi/cocoa/NSKeyedArchiverSPI.h:
+        (unarchivedObjectOfClassesFromData):
+        (unarchivedObjectOfClassFromData): Deleted.
+
 2017-12-21  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h

@@ -93 +93 @@
 }
 
-inline id _Nullable unarchivedObjectOfClassFromData(Class _Nonnull cls, NSData * _Nonnull data)
+inline id _Nullable unarchivedObjectOfClassesFromData(NSSet<Class> * _Nonnull classes, NSData * _Nonnull data)
 {
 #if USE(SECURE_ARCHIVER_API)
 #if !USE(SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING)
     // Remove this code when the fix from <rdar://problem/31376830> is deployed to all relevant build targets.
-    if (cls == [NSAttributedString class])
+    if ([classes containsObject:[NSAttributedString class]])
         return insecurelyUnarchiveObjectFromData(data);
 #endif
     NSError *error;
-    id value = [NSKeyedUnarchiver unarchivedObjectOfClass:cls fromData:data error:&error];
+    id value = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:data error:&error];
     if (!value)
         LOG_ERROR("Unable to unarchive data: %@", error);
     return value;
 #else
-    UNUSED_PARAM(cls);
+    UNUSED_PARAM(classes);
     return insecurelyUnarchiveObjectFromData(data);
 #endif

trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

@@ -266 +266 @@
 
     if (content.dataInAttributedStringFormat) {
-        NSAttributedString *attributedString = unarchivedObjectOfClassFromData([NSAttributedString class], content.dataInAttributedStringFormat->createNSData().get());
+        NSAttributedString *attributedString = unarchivedObjectOfClassesFromData([NSSet setWithObject:[NSAttributedString class]], content.dataInAttributedStringFormat->createNSData().get());
         if (attributedString)
             [representationsToRegister addRepresentingObject:attributedString];
@@ -381 +381 @@
             continue;
 
-        NSDictionary *teamDataObject = unarchivedObjectOfClassFromData([NSDictionary class], provider.teamData);
+        NSDictionary *teamDataObject = unarchivedObjectOfClassesFromData([NSSet setWithObjects:[NSDictionary class], [NSString class], [NSArray class], nil], provider.teamData);
         if (!teamDataObject)
             continue;