Changeset 228971 in webkit

Timestamp:

Feb 23, 2018 6:01:36 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Cookie Database files are wrongfully getting deleted when the database is opened
​https://bugs.webkit.org/show_bug.cgi?id=183051

Patch by Christopher Reid <​chris.reid@sony.com> on 2018-02-23
Reviewed by Per Arne Vollan.

The file stat logic was backwards causing a wrongful detection of database corruption.
Fixed the logic and abstracted these calls to use FileSystem.

• platform/network/curl/CookieJarDB.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarDB.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-23  Christopher Reid  <chris.reid@sony.com>
+
+        [Curl] Cookie Database files are wrongfully getting deleted when the database is opened
+        https://bugs.webkit.org/show_bug.cgi?id=183051
+
+        Reviewed by Per Arne Vollan.
+
+        The file stat logic was backwards causing a wrongful detection of database corruption.
+        Fixed the logic and abstracted these calls to use FileSystem.
+
+        * platform/network/curl/CookieJarDB.cpp:
+
 2018-02-23  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp

@@ -173 +173 @@
         return;
 
-    FILE* f = fopen(getCorruptionMarkerPath().utf8().data(), "wb");
-    fclose(f);
+    auto handle = FileSystem::openFile(getCorruptionMarkerPath(), FileSystem::FileOpenMode::Write);
+    if (FileSystem::isHandleValid(handle))
+        FileSystem::closeFile(handle);
 }
 
 bool CookieJarDB::checkDatabaseCorruptionAndRemoveIfNeeded()
 {
-    if (isOnMemory())
-        return false;
-
-    struct stat st;
-    int ret = stat(getCorruptionMarkerPath().utf8().data(), &st);
-    if (!ret)
-        return false;
-
-    deleteAllDatabaseFiles();
-    return true;
+    if (!isOnMemory() && FileSystem::fileExists(getCorruptionMarkerPath())) {
+        deleteAllDatabaseFiles();
+        return true;
+    }
+
+    return false;
 }