Changeset 34982 in webkit

Timestamp:

Jul 3, 2008 11:13:29 AM (16 years ago)

Author:

cwzwarich@webkit.org

Message:

2008-07-03 Cameron Zwarich <​cwzwarich@uwaterloo.ca>

Reviewed by Geoff.

Bug 19853: REGRESSION (r34838): Crash when visiting ​http://www.thewebsiteisdown.com/salesguy.html
​https://bugs.webkit.org/show_bug.cgi?id=19853

Remove the body of _NPN_SetException(), because it was simply calling
throwError(), which sets an exception on an ExecState but does not
actually handle it. The presence of an exception on the global ExecState
causes assertions that there is no exception set on that ExecState to
fail, as well as causing Machine::execute() to mistakingly return 0 in
some cases, as it assumes the presence of an exception implies that it
has run out of memory.

• bridge/NP_jsobject.cpp: (_NPN_SetException):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/NP_jsobject.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-07-03  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Geoff.
+
+        Bug 19853: REGRESSION (r34838): Crash when visiting http://www.thewebsiteisdown.com/salesguy.html
+        https://bugs.webkit.org/show_bug.cgi?id=19853
+
+        Remove the body of _NPN_SetException(), because it was simply calling
+        throwError(), which sets an exception on an ExecState but does not
+        actually handle it. The presence of an exception on the global ExecState
+        causes assertions that there is no exception set on that ExecState to
+        fail, as well as causing Machine::execute() to mistakingly return 0 in
+        some cases, as it assumes the presence of an exception implies that it
+        has run out of memory.
+
+        * bridge/NP_jsobject.cpp:
+        (_NPN_SetException):
+
 2008-07-03  Maciej Katafiasz  <mathrick@gmail.com>
 

trunk/WebCore/bridge/NP_jsobject.cpp

@@ -352 +352 @@
 }
 
-void _NPN_SetException(NPObject* o, const NPUTF8* message)
-{
-    if (o->_class == NPScriptObjectClass) {
-        JavaScriptObject* obj = (JavaScriptObject*)o; 
-        RootObject* rootObject = obj->rootObject;
-        if (!rootObject || !rootObject->isValid())
-            return;
-
-        ExecState* exec = rootObject->globalObject()->globalExec();
-        JSLock lock(false);
-        throwError(exec, GeneralError, message);
-    }
+void _NPN_SetException(NPObject*, const NPUTF8*)
+{
+    // FIXME:
+    // Bug 19888: Implement _NPN_SetException() correctly
+    // <https://bugs.webkit.org/show_bug.cgi?id=19888>
 }