Changeset 187174 in webkit

Timestamp:

Jul 22, 2015, 12:56:16 PM (11 years ago)

Author:

weinig@apple.com

Message:

Encode/Decode underlying errors when serializing NSErrors
<rdar://problem/21818117>
​https://bugs.webkit.org/show_bug.cgi?id=147199

Reviewed by Anders Carlsson.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(IPC::ArgumentCoder<CertificateInfo>::decode):
(IPC::encodeNSError):
(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::decodeNSError):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):
Break out encoding/decoding of the NSErrors into a helpers so they can be called
for the underlying error.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-22  Sam Weinig  <sam@webkit.org>
+
+        Encode/Decode underlying errors when serializing NSErrors
+        <rdar://problem/21818117>
+        https://bugs.webkit.org/show_bug.cgi?id=147199
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (IPC::ArgumentCoder<CertificateInfo>::decode):
+        (IPC::encodeNSError):
+        (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+        (IPC::decodeNSError):
+        (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+        Break out encoding/decoding of the NSErrors into a helpers so they can be called
+        for the underlying error.
+
 2015-07-22  Beth Dakin  <bdakin@apple.com>
 

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

@@ -192 +192 @@
 }
 
-void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
-{
-    bool errorIsNull = resourceError.isNull();
-    encoder << errorIsNull;
-
-    if (errorIsNull)
-        return;
-
-    NSError *nsError = resourceError.nsError();
-
+static void encodeNSError(ArgumentEncoder& encoder, NSError *nsError)
+{
     String domain = [nsError domain];
     encoder << domain;
@@ -243 +235 @@
     ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
     encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
+
+    if (id underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey]) {
+        ASSERT([underlyingError isKindOfClass:[NSError class]]);
+        encoder << true;
+        encodeNSError(encoder, underlyingError);
+    } else
+        encoder << false;
+}
+
+void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
+{
+    bool errorIsNull = resourceError.isNull();
+    encoder << errorIsNull;
+
+    if (errorIsNull)
+        return;
+
+    NSError *nsError = resourceError.nsError();
+    encodeNSError(encoder, nsError);
+}
+
+static bool decodeNSError(ArgumentDecoder& decoder, RetainPtr<NSError>& nsError)
+{
+    String domain;
+    if (!decoder.decode(domain))
+        return false;
+
+    int64_t code;
+    if (!decoder.decode(code))
+        return false;
+
+    RetainPtr<CFDictionaryRef> userInfo;
+    if (!IPC::decode(decoder, userInfo))
+        return false;
+
+    CertificateInfo certificate;
+    if (!decoder.decode(certificate))
+        return false;
+
+    if (certificate.certificateChain()) {
+        userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+        CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
+    }
+
+    bool hasUnderlyingError = false;
+    if (!decoder.decode(hasUnderlyingError))
+        return false;
+
+    if (hasUnderlyingError) {
+        RetainPtr<NSError> underlyingNSError;
+        if (!decodeNSError(decoder, underlyingNSError))
+            return false;
+
+        userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+        CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), NSUnderlyingErrorKey, underlyingNSError.get());
+    }
+
+    nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
+    return true;
 }
 
@@ -255 +306 @@
         return true;
     }
-
-    String domain;
-    if (!decoder.decode(domain))
-        return false;
-
-    int64_t code;
-    if (!decoder.decode(code))
-        return false;
-
-    RetainPtr<CFDictionaryRef> userInfo;
-    if (!IPC::decode(decoder, userInfo))
-        return false;
-
-    CertificateInfo certificate;
-    if (!decoder.decode(certificate))
-        return false;
-
-    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:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
+    
+    RetainPtr<NSError> nsError;
+    if (!decodeNSError(decoder, nsError))
+        return false;
 
     resourceError = ResourceError(nsError.get());