Changeset 60729 in webkit

Timestamp:

Jun 4, 2010 8:40:22 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-04 Lyon Chen <​liachen@rim.com>

Reviewed by Darin Adler.

ApplicationCacheStorage::storeNewestCache() Crash WebKit when openDatabase(true) failed
​https://bugs.webkit.org/show_bug.cgi?id=40074

Adding m_database.isOpen() check for every openDatabase(true) call, this is needed because
openDatabase(true) could still fail, for example when cacheStorage is full or no longer available.

• loader/appcache/ApplicationCacheStorage.cpp: (WebCore::ApplicationCacheStorage::store): (WebCore::ApplicationCacheStorage::storeNewestCache):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/appcache/ApplicationCacheStorage.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  Lyon Chen  <liachen@rim.com>
+
+        Reviewed by Darin Adler.
+
+        ApplicationCacheStorage::storeNewestCache() Crash WebKit when openDatabase(true) failed
+        https://bugs.webkit.org/show_bug.cgi?id=40074
+
+        Adding m_database.isOpen() check for every openDatabase(true) call, this is needed because
+        openDatabase(true) could still fail, for example when cacheStorage is full or no longer available.
+
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        (WebCore::ApplicationCacheStorage::store):
+        (WebCore::ApplicationCacheStorage::storeNewestCache):
+
 2010-06-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/loader/appcache/ApplicationCacheStorage.cpp

@@ -626 +626 @@
     
     openDatabase(true);
-    
+
+    // openDatabase(true) could still fail, for example when cacheStorage is full or no longer available.
+    if (!m_database.isOpen())
+        return false;
+
     // First, insert the data
     SQLiteStatement dataStatement(m_database, "INSERT INTO CacheResourceData (data) VALUES (?)");
@@ -712 +716 @@
     
     openDatabase(true);
+
+    if (!m_database.isOpen())
+        return false;
  
     m_isMaximumSizeReached = false;
@@ -742 +749 @@
 {
     openDatabase(true);
+
+    if (!m_database.isOpen())
+        return false;
 
     m_isMaximumSizeReached = false;