Title: [276730] trunk/Source/WebKit
Revision
276730
Author
[email protected]
Date
2021-04-28 12:59:46 -0700 (Wed, 28 Apr 2021)

Log Message

REGRESSION(r275267) Network process crashes in Data::adoptMap
https://bugs.webkit.org/show_bug.cgi?id=225159
<rdar://77066555>

Patch by Alex Christensen <[email protected]> on 2021-04-28
Reviewed by Geoffrey Garen.

There was a missing check to see if mapping was successful.

* NetworkProcess/cache/NetworkCacheData.cpp:
(WebKit::NetworkCache::Data::mapToFile const):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (276729 => 276730)


--- trunk/Source/WebKit/ChangeLog	2021-04-28 19:35:14 UTC (rev 276729)
+++ trunk/Source/WebKit/ChangeLog	2021-04-28 19:59:46 UTC (rev 276730)
@@ -1,5 +1,18 @@
 2021-04-28  Alex Christensen  <[email protected]>
 
+        REGRESSION(r275267) Network process crashes in Data::adoptMap
+        https://bugs.webkit.org/show_bug.cgi?id=225159
+        <rdar://77066555>
+
+        Reviewed by Geoffrey Garen.
+
+        There was a missing check to see if mapping was successful.
+
+        * NetworkProcess/cache/NetworkCacheData.cpp:
+        (WebKit::NetworkCache::Data::mapToFile const):
+
+2021-04-28  Alex Christensen  <[email protected]>
+
         Add SPI to query whether a URL would be upgraded to HTTPS
         https://bugs.webkit.org/show_bug.cgi?id=225154
         <rdar://77269904>

Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp (276729 => 276730)


--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp	2021-04-28 19:35:14 UTC (rev 276729)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp	2021-04-28 19:59:46 UTC (rev 276730)
@@ -44,6 +44,8 @@
     FileSystem::PlatformFileHandle handle;
     auto applyData = [&](const Function<bool(const uint8_t*, size_t)>& applier) { apply(applier); };
     auto mappedFile = FileSystem::mapToFile(path, size(), WTFMove(applyData), &handle);
+    if (!mappedFile)
+        return { };
     return Data::adoptMap(WTFMove(mappedFile), handle);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to