Title: [278240] trunk/Source/_javascript_Core
Revision
278240
Author
mark....@apple.com
Date
2021-05-29 09:59:52 -0700 (Sat, 29 May 2021)

Log Message

VM::isTerminationException() should only be run on a non-null exception value.
https://bugs.webkit.org/show_bug.cgi?id=226417
rdar://78646170

Reviewed by Filip Pizlo.

* jsc.cpp:
(runInteractive):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (278239 => 278240)


--- trunk/Source/_javascript_Core/ChangeLog	2021-05-29 13:38:58 UTC (rev 278239)
+++ trunk/Source/_javascript_Core/ChangeLog	2021-05-29 16:59:52 UTC (rev 278240)
@@ -1,3 +1,14 @@
+2021-05-29  Mark Lam  <mark....@apple.com>
+
+        VM::isTerminationException() should only be run on a non-null exception value.
+        https://bugs.webkit.org/show_bug.cgi?id=226417
+        rdar://78646170
+
+        Reviewed by Filip Pizlo.
+
+        * jsc.cpp:
+        (runInteractive):
+
 2021-05-29  Adrian Perez de Castro  <ape...@igalia.com>
 
         Non-unified build fixes, late-ish May 2021 edition redux

Modified: trunk/Source/_javascript_Core/jsc.cpp (278239 => 278240)


--- trunk/Source/_javascript_Core/jsc.cpp	2021-05-29 13:38:58 UTC (rev 278239)
+++ trunk/Source/_javascript_Core/jsc.cpp	2021-05-29 16:59:52 UTC (rev 278240)
@@ -3139,7 +3139,7 @@
         NakedPtr<Exception> evaluationException;
         JSValue returnValue = evaluate(globalObject, jscSource(line, sourceOrigin, sourceOrigin.string()), JSValue(), evaluationException);
 #endif
-        if (vm.isTerminationException(evaluationException.get()))
+        if (evaluationException && vm.isTerminationException(evaluationException.get()))
             vm.setExecutionForbidden();
 
         Expected<CString, UTF8ConversionError> utf8;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to