Changeset 184026 in webkit

Timestamp:

May 8, 2015 4:13:36 PM (9 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/20757196> NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
​https://bugs.webkit.org/show_bug.cgi?id=144818

Reviewed by Anders Carlsson.

Allow NSString instances that contain unpaired surrogates to be encoded by
WKRemoteObjectCoder by encoding them directly rather than using
-[NSString encodeWithCoder:].

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(encodeString): Added. Sets an API::String as the object to encode.
(encodeObject): Changed to use encodeString for NSString instances.
(decodeString): Added. Gets an API::String from the dictionary and returns it as an
NSString.
(decodeObject): Changed to use decodeString for NSString instances.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-08  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/20757196> NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
+        https://bugs.webkit.org/show_bug.cgi?id=144818
+
+        Reviewed by Anders Carlsson.
+
+        Allow NSString instances that contain unpaired surrogates to be encoded by
+        WKRemoteObjectCoder by encoding them directly rather than using
+        -[NSString encodeWithCoder:].
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (encodeString): Added. Sets an API::String as the object to encode.
+        (encodeObject): Changed to use encodeString for NSString instances.
+        (decodeString): Added. Gets an API::String from the dictionary and returns it as an
+        NSString.
+        (decodeObject): Changed to use decodeString for NSString instances.
+
 2015-05-08  Timothy Horton  <timothy_horton@apple.com>
 

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

@@ -42 +42 @@
 static const char* const classNameKey = "$class";
 static const char* const objectStreamKey = "$objectStream";
+static const char* const stringKey = "$string";
 
 static NSString * const selectorKey = @"selector";
@@ -212 +213 @@
         }
     }
+}
+
+static void encodeString(WKRemoteObjectEncoder *encoder, NSString *string)
+{
+    encoder->_currentDictionary->set(stringKey, API::String::create(string));
 }
 
@@ -236 +242 @@
     }
 
+    if ([object isKindOfClass:[NSString class]]) {
+        encodeString(encoder, object);
+        return;
+    }
+
     [object encodeWithCoder:encoder];
 }
@@ -547 +558 @@
 }
 
+static NSString *decodeString(WKRemoteObjectDecoder *decoder)
+{
+    API::String* string = decoder->_currentDictionary->get<API::String>(stringKey);
+    if (!string)
+        [NSException raise:NSInvalidUnarchiveOperationException format:@"String missing"];
+
+    return string->string();
+}
+
 static id decodeObject(WKRemoteObjectDecoder *decoder)
 {
@@ -563 +583 @@
     if (objectClass == [NSInvocation class])
         return decodeInvocation(decoder);
+
+    if (objectClass == [NSString class])
+        return decodeString(decoder);
 
     id result = [objectClass allocWithZone:decoder.zone];