Changeset 122488 in webkit

Timestamp:

Jul 12, 2012 11:31:09 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

storage tests are flaky (crashing) on windows
​https://bugs.webkit.org/show_bug.cgi?id=90469

Patch by James Weatherall <​wez@chromium.org> on 2012-07-12
Reviewed by Kentaro Hara.

Add a missing check that the underlying V8 object reference in a V8 NPObject is valid, and zero the NPObject's rootObject member when disposing it, to ensure that it won't be mistakenly touched after that point.

This patch is intended to resolve flakiness in the storage tests including:

storage/indexeddb/mozilla/indexes.html
storage/indexeddb/mozilla/key-requirements-inline-and-passed.html
storage/websql/multiple-databases-garbage-collection.html

• bindings/v8/NPV8Object.cpp:

(WebCore::disposeUnderlyingV8Object):
Zero the NPObject's underlying rootObject.
(_NPN_EvaluateHelper):
Add check that the underlying V8 object reference is valid.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/NPV8Object.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-12  James Weatherall  <wez@chromium.org>
+
+        storage tests are flaky (crashing) on windows
+        https://bugs.webkit.org/show_bug.cgi?id=90469
+
+        Reviewed by Kentaro Hara.
+
+        Add a missing check that the underlying V8 object reference in a V8 NPObject is valid, and zero the NPObject's rootObject member when disposing it, to ensure that it won't be mistakenly touched after that point.
+
+        This patch is intended to resolve flakiness in the storage tests including:
+          storage/indexeddb/mozilla/indexes.html
+          storage/indexeddb/mozilla/key-requirements-inline-and-passed.html
+          storage/websql/multiple-databases-garbage-collection.html
+
+        * bindings/v8/NPV8Object.cpp:
+        (WebCore::disposeUnderlyingV8Object):
+        Zero the NPObject's underlying rootObject.
+        (_NPN_EvaluateHelper):
+        Add check that the underlying V8 object reference is valid.
+
 2012-07-12  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebCore/bindings/v8/NPV8Object.cpp

@@ -187 +187 @@
     v8NpObject->v8Object.Dispose();
     v8NpObject->v8Object.Clear();
+    v8NpObject->rootObject = 0;
 }
 
@@ -320 +321 @@
 
     if (npObject->_class != npScriptObjectClass)
+        return false;
+    V8NPObject* v8NpObject = reinterpret_cast<V8NPObject*>(npObject);
+    if (v8NpObject->v8Object.IsEmpty())
         return false;