Attachment 369195 Details for Bug 197635 – Patch

[patch] Patch

bug-197635-20190506162303.patch (text/plain), 2.53 KB, created by Chris Dumez on 2019-05-06 16:23:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-05-06 16:23:03 PDT

Size: 2.53 KB

patch

obsolete

>Subversion Revision: 244985
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 79e75c63aae098ffcc257d1d38b835519483fc05..93856782b59ae54bcafcf21e686a657edb046176 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed build fix after r244984.
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
>index 2d4d33b940d654d9e60e80d9f4f3a5fad75714dc..cf55b00573879a2c51ab591ffc79b8af312b0a6b 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
>@@ -94,7 +94,6 @@ BlobStorage::Blob BlobStorage::add(const String& path, const Data& data)
>         return { data, hash };
> 
>     String blobPathString = blobPathForHash(hash);
>-    FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
>     
>     auto blobPath = FileSystem::fileSystemRepresentation(blobPathString);
>     auto linkPath = FileSystem::fileSystemRepresentation(path);
>@@ -102,6 +101,7 @@ BlobStorage::Blob BlobStorage::add(const String& path, const Data& data)
> 
>     bool blobExists = access(blobPath.data(), F_OK) != -1;
>     if (blobExists) {
>+        FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
>         auto existingData = mapFile(blobPath.data());
>         if (bytesEqual(existingData, data)) {
>             if (link(blobPath.data(), linkPath.data()) == -1)
>@@ -115,6 +115,8 @@ BlobStorage::Blob BlobStorage::add(const String& path, const Data& data)
>     if (mappedData.isNull())
>         return { };
> 
>+    FileSystem::makeSafeToUseMemoryMapForPath(blobPathString);
>+
>     if (link(blobPath.data(), linkPath.data()) == -1)
>         WTFLogAlways("Failed to create hard link from %s to %s", blobPath.data(), linkPath.data());
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197635: 369195