Changeset 163470 in webkit

Timestamp:

Feb 5, 2014, 1:21:49 PM (13 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] WKRemoteObjectInterface fails with doubles, NSNull, and empty NSStrings
​https://bugs.webkit.org/show_bug.cgi?id=128268

Reviewed by Anders Carlsson.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]): When returning nullptr, also
set the length out parameter to 0.

• Shared/API/Cocoa/WKRemoteObjectInterface.mm:

(propertyListClasses): Added NSNull.

• Shared/UserData.cpp:

(WebKit::UserData::encode): Encode the Double type.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectInterface.mm (modified) (1 diff)
• Shared/UserData.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-05  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] WKRemoteObjectInterface fails with doubles, NSNull, and empty NSStrings
+        https://bugs.webkit.org/show_bug.cgi?id=128268
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]): When returning nullptr, also
+        set the length out parameter to 0.
+
+        * Shared/API/Cocoa/WKRemoteObjectInterface.mm:
+        (propertyListClasses): Added NSNull.
+
+        * Shared/UserData.cpp:
+        (WebKit::UserData::encode): Encode the Double type.
+
 2014-02-05  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm

@@ -555 +555 @@
 {
     auto* data = _currentDictionary->get<API::Data>(escapeKey(key));
-    if (!data || !data->size())
+    if (!data || !data->size()) {
+        *length = 0;
         return nullptr;
+    }
 
     *length = data->size();

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm

@@ -56 +56 @@
 {
     // FIXME: Add more property list classes if needed.
-    static NSSet *propertyListClasses = [[NSSet alloc] initWithObjects:[NSArray class], [NSDictionary class], [NSNumber class], [NSString class], nil];
+    static NSSet *propertyListClasses = [[NSSet alloc] initWithObjects:[NSArray class], [NSDictionary class], [NSNull class], [NSNumber class], [NSString class], nil];
 
     return propertyListClasses;

trunk/Source/WebKit2/Shared/UserData.cpp

@@ -139 +139 @@
     }
 
+    case API::Object::Type::Double:
+        static_cast<const API::Double&>(object).encode(encoder);
+        break;
+
     case API::Object::Type::Error:
         static_cast<const API::Error&>(object).encode(encoder);