Changeset 86270 in webkit

Timestamp:

May 11, 2011 2:18:09 PM (13 years ago)

Author:

weinig@apple.com

Message:

Frequent crashes beneath WebCore::ScriptElement::prepareScript
​https://bugs.webkit.org/show_bug.cgi?id=60559

Reviewed by Eric Seidel.

• html/parser/HTMLScriptRunner.cpp:

(WebCore::HTMLScriptRunner::runScript):
Add null check and explanation that we are keeping the ASSERT to help
track down the cause and produce a test.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLScriptRunner.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Frequent crashes beneath WebCore::ScriptElement::prepareScript
+        https://bugs.webkit.org/show_bug.cgi?id=60559
+
+        * html/parser/HTMLScriptRunner.cpp:
+        (WebCore::HTMLScriptRunner::runScript):
+        Add null check and explanation that we are keeping the ASSERT to help
+        track down the cause and produce a test.
+
 2011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebCore/html/parser/HTMLScriptRunner.cpp

@@ -285 +285 @@
 
         ScriptElement* scriptElement = toScriptElement(script);
+
+        // This contains both and ASSERTION and a null check since we should not
+        // be getting into the case of a null script element, but seem to be from
+        // time to time. The assertion is left in to help find those cases and
+        // is being tracked by <https://bugs.webkit.org/show_bug.cgi?id=60559>.
         ASSERT(scriptElement);
+        if (!scriptElement)
+            return;
 
         scriptElement->prepareScript(scriptStartPosition);