Changeset 224885 in webkit

Timestamp:

Nov 15, 2017 10:36:57 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Move a compiled WKContentRuleList to its destination before calling mmap
​https://bugs.webkit.org/show_bug.cgi?id=179719

Reviewed by Brady Eidson.

Right now we compile a WKContentRuleList to a temporary file, call mmap, close the file, then move it.
Sometimes, especially on bots running tests, the move fails because the temporary file doesn't exist
any more. Moving the file before mmaping and closing the file might prevent this failure.

• UIProcess/API/APIContentRuleListStore.cpp:

(API::compiledToFile):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIContentRuleListStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-15  Alex Christensen  <achristensen@webkit.org>
+
+        Move a compiled WKContentRuleList to its destination before calling mmap
+        https://bugs.webkit.org/show_bug.cgi?id=179719
+
+        Reviewed by Brady Eidson.
+
+        Right now we compile a WKContentRuleList to a temporary file, call mmap, close the file, then move it.
+        Sometimes, especially on bots running tests, the move fails because the temporary file doesn't exist
+        any more.  Moving the file before mmaping and closing the file might prevent this failure.
+
+        * UIProcess/API/APIContentRuleListStore.cpp:
+        (API::compiledToFile):
+
 2017-11-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp

@@ -350 +350 @@
         return ContentRuleListStore::Error::CompileFailed;
     }
-    
+
+    if (!moveFile(temporaryFilePath, finalFilePath)) {
+        WTFLogAlways("Content Rule List compiling failed: Moving file failed.");
+        return ContentRuleListStore::Error::CompileFailed;
+    }
+
     mappedData = adoptAndMapFile(temporaryFileHandle, 0, metaData.fileSize());
     if (mappedData.isNull()) {
         WTFLogAlways("Content Rule List compiling failed: Mapping file failed.");
-        return ContentRuleListStore::Error::CompileFailed;
-    }
-
-    if (!moveFile(temporaryFilePath, finalFilePath)) {
-        WTFLogAlways("Content Rule List compiling failed: Moving file failed.");
+        deleteFile(finalFilePath);
         return ContentRuleListStore::Error::CompileFailed;
     }