Changeset 244997 in webkit

Timestamp:

May 6, 2019 5:42:44 PM (5 years ago)

Author:

Chris Dumez

Message:

ASSERT at WebKit::NetworkCache::makeSafeToUseMemoryMapForPath under Storage::StoreBodyAsBlob when running WebDriver tests
​https://bugs.webkit.org/show_bug.cgi?id=197635
<rdar://problem/50473149>

Reviewed by Geoffrey Garen.

We need to make sure the the path at blobPathString exists before calling FileSystem::makeSafeToUseMemoryMapForPath().
If the blob does not already exist when BlobStorage::add() is called, what will create it is the call to Data::mapToFile().

• NetworkProcess/cache/NetworkCacheBlobStorage.cpp:

(WebKit::NetworkCache::BlobStorage::add):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheBlobStorage.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-06  Chris Dumez  <cdumez@apple.com>
+
+        ASSERT at WebKit::NetworkCache::makeSafeToUseMemoryMapForPath under Storage::StoreBodyAsBlob when running WebDriver tests
+        https://bugs.webkit.org/show_bug.cgi?id=197635
+        <rdar://problem/50473149>
+
+        Reviewed by Geoffrey Garen.
+
+        We need to make sure the the path at blobPathString exists before calling FileSystem::makeSafeToUseMemoryMapForPath().
+        If the blob does not already exist when BlobStorage::add() is called, what will create it is the call to Data::mapToFile().
+
+        * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+        (WebKit::NetworkCache::BlobStorage::add):
+
 2019-05-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp

@@ -95 +95 @@
 
     String blobPathString = blobPathForHash(hash);
-    FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
     
     auto blobPath = FileSystem::fileSystemRepresentation(blobPathString);
@@ -103 +102 @@
     bool blobExists = access(blobPath.data(), F_OK) != -1;
     if (blobExists) {
+        FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
         auto existingData = mapFile(blobPath.data());
         if (bytesEqual(existingData, data)) {
@@ -115 +115 @@
     if (mappedData.isNull())
         return { };
+
+    FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
 
     if (link(blobPath.data(), linkPath.data()) == -1)