Changeset 35911 in webkit for trunk/JavaScriptCore/kjs/Shell.cpp

Timestamp:

Aug 24, 2008, 9:08:01 PM (17 years ago)

Author:

[email protected]

Message:

2008-08-24 Cameron Zwarich <​[email protected]>

Reviewed by Oliver Hunt.

Bug 20093: JSC shell does not clear exceptions after it executes toString on an expression
<​https://bugs.webkit.org/show_bug.cgi?id=20093>

Clear exceptions after evaluating any code in the JSC shell. We do not
report exceptions that are caused by calling toString on the final
valued, but at least we avoid incorrect behaviour.

Also, print any exceptions that occurred while evaluating code at the
interactive prompt, not just while evaluating code from a file.

• kjs/Shell.cpp: (runWithScripts): (runInteractive):

File:

• trunk/JavaScriptCore/kjs/Shell.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -351 +351 @@
             success = success && completion.complType() != Throw;
             if (dump) {
-                if (success)
+                if (completion.complType() == Throw)
+                    printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+                else
                     printf("End: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
-                else
-                    printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
             }
+
+            globalObject->globalExec()->clearException();
 
 #if ENABLE(SAMPLING_TOOL)
@@ -391 +393 @@
         Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), interpreterName, 1, line.data());
 #endif
-        if (completion.isValueCompletion())
+        if (completion.complType() == Throw)
+            printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+        else
             printf("%s\n", completion.value()->toString(globalObject->globalExec()).UTF8String().c_str());
+
+        globalObject->globalExec()->clearException();
     }
     printf("\n");