Attachment 360866 Details for Bug 194144 – Patch

[patch] Patch

file_194144.txt (text/plain), 2.62 KB, created by David Quesada on 2019-02-01 09:39:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Quesada

Created: 2019-02-01 09:39:16 PST

Size: 2.62 KB

patch

obsolete

>commit 89b7fe51a40ebc3a9c0934abeeb0ee894a6c0ec7
>Author: David Quesada <david_quesada@apple.com>
>Date:   Fri Feb 1 09:37:45 2019 -0800
>
>    Network Process crash when resuming downloads: '-[__NSDictionaryI setObject:forKey:]: unrecognized selector sent to instance %p'
>    https://bugs.webkit.org/show_bug.cgi?id=194144
>    rdar://problem/47553456
>    
>    Reviewed by NOBODY (OOPS!).
>    
>    * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
>    (WebKit::Download::resume):
>        Make a mutable copy of the root object decoded from the resume data.
>        It might have been originally encoded as an immutable dictionary.
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2b6b5f30167..73f128c5479 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-01  David Quesada  <david_quesada@apple.com>
>+
>+        Network Process crash when resuming downloads: '-[__NSDictionaryI setObject:forKey:]: unrecognized selector sent to instance %p'
>+        https://bugs.webkit.org/show_bug.cgi?id=194144
>+        rdar://problem/47553456
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
>+        (WebKit::Download::resume):
>+            Make a mutable copy of the root object decoded from the resume data.
>+            It might have been originally encoded as an immutable dictionary.
>+
> 2019-01-31  Takashi Komori  <Takashi.Komori@sony.com>
> 
>         [Curl] Remove unnecessary member from NetworkStorageSession.
>diff --git a/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm b/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
>index 1b9e3f227df..d6d8c9a45cd 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
>@@ -58,7 +58,7 @@ void Download::resume(const IPC::DataReference& resumeData, const String& path,
>     });
>     auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingFromData:nsData.get() error:nil]);
>     [unarchiver setDecodingFailurePolicy:NSDecodingFailurePolicyRaiseException];
>-    auto dictionary = retainPtr([unarchiver decodeObjectOfClasses:plistClasses forKey:@"NSKeyedArchiveRootObjectKey"]);
>+    auto dictionary = adoptNS(static_cast<NSMutableDictionary *>([[unarchiver decodeObjectOfClasses:plistClasses forKey:@"NSKeyedArchiveRootObjectKey"] mutableCopy]));
>     [unarchiver finishDecoding];
>     [dictionary setObject:static_cast<NSString*>(path) forKey:@"NSURLSessionResumeInfoLocalPath"];
>     auto encoder = adoptNS([[NSKeyedArchiver alloc] initRequiringSecureCoding:YES]);

Actions: View | Formatted Diff | Diff

Attachments on bug 194144: 360866