Changeset 159887 in webkit

Timestamp:

Nov 30, 2013 10:49:53 AM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
​https://bugs.webkit.org/show_bug.cgi?id=125016

Reviewed by Anders “happy name day” Carlsson.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(CoreIPC::::encodePlatformData): Encode all string- and URL-valued keys as a dictionary.
(CoreIPC::::decodePlatformData): Decode user info as a dictionary.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/WebCoreArgumentCodersMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-30  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
+        https://bugs.webkit.org/show_bug.cgi?id=125016
+
+        Reviewed by Anders “happy name day” Carlsson.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (CoreIPC::::encodePlatformData): Encode all string- and URL-valued keys as a dictionary.
+        (CoreIPC::::decodePlatformData): Decode user info as a dictionary.
+
 2013-11-29  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -156 +156 @@
     encoder << code;
 
-    HashMap<String, String> stringUserInfoMap;
-
-    NSDictionary* userInfo = [nsError userInfo];
-    for (NSString *key in userInfo) {
-        id value = [userInfo objectForKey:key];
-        if (![value isKindOfClass:[NSString class]])
-            continue;
-
-        stringUserInfoMap.set(key, (NSString *)value);
-        continue;
-    }
-    encoder << stringUserInfoMap;
+    NSDictionary *userInfo = [nsError userInfo];
+
+    RetainPtr<CFMutableDictionaryRef> filteredUserInfo = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, userInfo.count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+
+    [userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
+        if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]])
+            CFDictionarySetValue(filteredUserInfo.get(), key, value);
+    }];
+
+    CoreIPC::encode(encoder, filteredUserInfo.get());
 
     id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
@@ -193 +191 @@
         return false;
 
-    HashMap<String, String> stringUserInfoMap;
-    if (!decoder.decode(stringUserInfoMap))
+    RetainPtr<CFDictionaryRef> userInfo;
+    if (!CoreIPC::decode(decoder, userInfo))
         return false;
 
@@ -201 +199 @@
         return false;
 
-    NSUInteger userInfoSize = stringUserInfoMap.size();
-    if (certificate.certificateChain())
-        userInfoSize++;
-
-    NSMutableDictionary* userInfo = [NSMutableDictionary dictionaryWithCapacity:userInfoSize];
-    
-    HashMap<String, String>::const_iterator it = stringUserInfoMap.begin();
-    HashMap<String, String>::const_iterator end = stringUserInfoMap.end();
-    for (; it != end; ++it)
-        [userInfo setObject:nsString(it->value) forKey:nsString(it->key)];
-
-    if (certificate.certificateChain())
-        [userInfo setObject:(NSArray *)certificate.certificateChain() forKey:@"NSErrorPeerCertificateChainKey"];
-
-    RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:userInfo]);
+    if (certificate.certificateChain()) {
+        userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+        CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
+    }
+
+    RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:(NSDictionary *)userInfo.get()]);
 
     resourceError = ResourceError(nsError.get());