Changeset 95166 in webkit

Timestamp:

Sep 14, 2011 10:12:51 PM (13 years ago)

Author:

Nate Chapin

Message:

[V8] Null-check the v8::Context in
V8DOMWindowShell:namedItemAdded() before using it.
Also, add some logging to figure out how we're getting
into this bad state.
​https://bugs.webkit.org/show_bug.cgi?id=68099

Reviewed by Adam Barth.

No new tests, no known repro.

• bindings/v8/V8DOMWindowShell.cpp:

(WebCore::V8DOMWindowShell::namedItemAdded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8DOMWindowShell.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-14  Nate Chapin  <japhet@chromium.org>
+
+        [V8] Null-check the v8::Context in 
+        V8DOMWindowShell:namedItemAdded() before using it.
+        Also, add some logging to figure out how we're getting
+        into this bad state.
+        https://bugs.webkit.org/show_bug.cgi?id=68099
+
+        Reviewed by Adam Barth.
+
+        No new tests, no known repro.
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::namedItemAdded):
+
 2011-09-14  Patrick Gansterer  <paroga@webkit.org>
 

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

@@ -573 +573 @@
     initContextIfNeeded();
 
+    if (!isContextInitialized()) {
+#if PLATFORM(CHROMIUM)
+        // FIXME: Temporary diagnostics as to why V8 sometimes crashes with a null context below.
+        // See https://bugs.webkit.org/show_bug.cgi?id=68099.
+        PlatformSupport::incrementStatsCounter("V8Bindings.namedItemAdded.initContextFailed");
+        if (m_frame->settings() && !m_frame->settings()->isJavaScriptEnabled())
+            PlatformSupport::incrementStatsCounter("V8Bindings.namedItemAdded.scriptBlockedByWebCoreSettings");
+
+        if (!m_frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+            PlatformSupport::incrementStatsCounter("V8Bindings.namedItemAdded.scriptBlockedByScriptController");
+
+        if (V8Proxy::handleOutOfMemory())
+            PlatformSupport::incrementStatsCounter("V8Bindings.namedItemAdded.outOfMemory");
+#endif
+        return;
+    }
+
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(m_context);