Changeset 10222 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Aug 16, 2005, 6:00:00 PM (20 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• fixed crash in one of the JavaScript tests (introduced by my throwError change)

• kjs/nodes.cpp: (Node::setExceptionDetailsIfNeeded): Check if the exception is an object before setting the file and line number properties on it. Something to think about in the future -- do we really want to do this on any object that's thrown? How about limiting it to error objects that were created by the JavaScript engine?

• changed kjs_fast_malloc so we don't have two conflicting versions of the same function

• kjs/fast_malloc.h: Took out all the ifdefs from this header.
• kjs/fast_malloc.cpp: Added non-NDEBUG versions of the functions that just call the system malloc, and put the NDEBUG versions in an #else.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -190 +190 @@
 void Node::setExceptionDetailsIfNeeded(ExecState *exec)
 {
-    if (exec->hadException()) {
-        ObjectImp *exception = static_cast<ObjectImp *>(exec->exception());
+    ValueImp *exceptionValue = exec->exception();
+    if (exceptionValue->isObject()) {
+        ObjectImp *exception = static_cast<ObjectImp *>(exceptionValue);
         if (!exception->hasProperty(exec, "line") && !exception->hasProperty(exec, "sourceURL")) {
             exception->put(exec, "line", Number(line));