Changeset 173543 in webkit

Timestamp:

Sep 11, 2014, 3:14:19 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r173016. <rdar://problem/18120176>

Location:

branches/safari-600.1.4.11-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorIndexedDBAgent.cpp (modified) (6 diffs)

branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r173016.
+
+    2014-08-27  Timothy Hatcher  <timothy@apple.com>
+
+            Web Inspector: Crash when you open Web Inspector in a private window (due to IndexedDB)
+            https://bugs.webkit.org/show_bug.cgi?id=136293
+
+            Reviewed by Joseph Pecoraro.
+
+            * inspector/InspectorIndexedDBAgent.cpp:
+            (WebCore::InspectorIndexedDBAgent::requestDatabaseNames): Null check idbRequest from
+            IDBFactory::getDatabaseNames, which can return null now after r172603 in private browsing.
+
 2014-09-10  Babak Shafiei  <bshafiei@apple.com>
 
         Merge r173345.
-        
+
     2014-09-05  Tim Horton  <timothy_horton@apple.com>
 

branches/safari-600.1.4.11-branch/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

@@ -584 +584 @@
 {
     Document* document = frame ? frame->document() : nullptr;
-
     if (!document)
         *errorString = "No document for given frame found";
-
     return document;
 }
@@ -598 +596 @@
         return nullptr;
     }
+
     IDBFactory* idbFactory = DOMWindowIndexedDatabase::indexedDB(domWindow);
-
     if (!idbFactory)
         *errorString = "No IndexedDB factory for given frame found";
@@ -612 +610 @@
     if (!document)
         return;
+
     IDBFactory* idbFactory = assertIDBFactory(errorString, document);
     if (!idbFactory)
@@ -618 +617 @@
     ExceptionCode ec = 0;
     RefPtr<IDBRequest> idbRequest = idbFactory->getDatabaseNames(document, ec);
-    if (ec) {
+    if (!idbRequest || ec) {
         requestCallback->sendFailure("Could not obtain database names.");
         return;
     }
+
     idbRequest->addEventListener(eventNames().successEvent, GetDatabaseNamesCallback::create(requestCallback, document->securityOrigin()->toRawString()), false);
 }
@@ -631 +631 @@
     if (!document)
         return;
+
     IDBFactory* idbFactory = assertIDBFactory(errorString, document);
     if (!idbFactory)
@@ -645 +646 @@
     if (!document)
         return;
+
     IDBFactory* idbFactory = assertIDBFactory(errorString, document);
     if (!idbFactory)