Merge pull request #1359 from asurdej-comcast/localstorage_corruption

[LocalStorage] Fix NetworkProcess crash on sqlite database corruption

Author: magomez

Source/WebCore/platform/sql/SQLiteStatement.h

@@ -28,12 +28,13 @@
 #include "SQLValue.h"
 #include "SQLiteDatabase.h"
 #include <wtf/Span.h>
+#include <wtf/WeakPtr.h>
 
 struct sqlite3_stmt;
 
 namespace WebCore {
 
-class SQLiteStatement {
+class SQLiteStatement : public CanMakeWeakPtr<SQLiteStatement> {
     WTF_MAKE_NONCOPYABLE(SQLiteStatement); WTF_MAKE_FAST_ALLOCATED;
 public:
     WEBCORE_EXPORT ~SQLiteStatement();

Source/WebCore/platform/sql/SQLiteStatementAutoResetScope.cpp

@@ -54,4 +54,7 @@ SQLiteStatementAutoResetScope::~SQLiteStatementAutoResetScope()
         m_statement->reset();
 }
 
+SQLiteStatement* SQLiteStatementAutoResetScope::get() { return m_statement.get(); }
+SQLiteStatement* SQLiteStatementAutoResetScope::operator->() { return m_statement.get(); }
+
 }

Source/WebCore/platform/sql/SQLiteStatementAutoResetScope.h

@@ -27,6 +27,7 @@
 
 #include <wtf/FastMalloc.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
 class SQLiteStatement;
@@ -39,14 +40,14 @@ class SQLiteStatementAutoResetScope {
     WEBCORE_EXPORT SQLiteStatementAutoResetScope& operator=(SQLiteStatementAutoResetScope&& other);
     WEBCORE_EXPORT ~SQLiteStatementAutoResetScope();
 
-    explicit operator bool() const { return m_statement; }
+    explicit operator bool() const { return !!m_statement; }
     bool operator!() const { return !m_statement; }
 
-    SQLiteStatement* get() { return m_statement; }
-    SQLiteStatement* operator->() { return m_statement; }
+    SQLiteStatement* get();
+    SQLiteStatement* operator->();
 
 private:
-    SQLiteStatement* m_statement;
+    WeakPtr<SQLiteStatement> m_statement;
 };
 
 } // namespace WebCore

Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp

@@ -356,9 +356,10 @@ Expected<void, StorageError> SQLiteStorageArea::setItem(const String& key, const
     if (result != SQLITE_DONE) {
         if (!handleDatabaseCorruption || !handleDatabaseCorruptionIfNeeded(result))
             return makeUnexpected(StorageError::Database);
-        statement = cachedStatement(StatementType::SetItem);
-        if (!statement || statement->bindText(1, key) || statement->bindBlob(2, value) || statement->step() != SQLITE_DONE)
-            return makeUnexpected(StorageError::Database);
+
+        // The database was recovered from corruption.
+        // Try again but without handling database corruption this time to avoid infinite loop.
+        return setItem(key, value, false);
     }
 
     updateCacheIfNeeded(key, value);