Title: [266757] trunk/Source/WebKit
Revision
266757
Author
[email protected]
Date
2020-09-08 16:03:15 -0700 (Tue, 08 Sep 2020)

Log Message

NetworkProcess: Check for invalid handle before writing salt file
https://bugs.webkit.org/show_bug.cgi?id=216285

Reviewed by Sihui Liu.

Covered by existing tests.

Fixes crashes in GTK/WPE after r266742.

* NetworkProcess/cache/NetworkCacheData.cpp:
(WebKit::NetworkCache::readOrMakeSalt):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (266756 => 266757)


--- trunk/Source/WebKit/ChangeLog	2020-09-08 22:58:11 UTC (rev 266756)
+++ trunk/Source/WebKit/ChangeLog	2020-09-08 23:03:15 UTC (rev 266757)
@@ -1,3 +1,17 @@
+2020-09-08  Lauro Moura  <[email protected]>
+
+        NetworkProcess: Check for invalid handle before writing salt file
+        https://bugs.webkit.org/show_bug.cgi?id=216285
+
+        Reviewed by Sihui Liu.
+
+        Covered by existing tests.
+
+        Fixes crashes in GTK/WPE after r266742.
+
+        * NetworkProcess/cache/NetworkCacheData.cpp:
+        (WebKit::NetworkCache::readOrMakeSalt):
+
 2020-09-08  Brady Eidson  <[email protected]>
 
         Crashtracer inside PDFPlugin::createScrollbar.

Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp (266756 => 266757)


--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp	2020-09-08 22:58:11 UTC (rev 266756)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp	2020-09-08 23:03:15 UTC (rev 266757)
@@ -159,6 +159,9 @@
 
     Salt salt = makeSalt();
     auto file = FileSystem::openFile(path, FileSystem::FileOpenMode::Write, FileSystem::FileAccessPermission::User);
+    if (!FileSystem::isHandleValid(file))
+        return { };
+
     bool success = static_cast<std::size_t>(FileSystem::writeToFile(file, reinterpret_cast<char*>(salt.data()), salt.size())) == salt.size();
     FileSystem::closeFile(file);
     if (!success)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to