From cd02b22bd7300ac7b93e82a7b587f8a66039c4fe Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 5 Mar 2023 16:50:09 +0100 Subject: [PATCH] Don't crash in uncaughtException() if there isn't an exception --- libraries/script-engine/src/v8/ScriptEngineV8.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/v8/ScriptEngineV8.cpp b/libraries/script-engine/src/v8/ScriptEngineV8.cpp index ef4ad1fff4..d33f52496e 100644 --- a/libraries/script-engine/src/v8/ScriptEngineV8.cpp +++ b/libraries/script-engine/src/v8/ScriptEngineV8.cpp @@ -1540,7 +1540,11 @@ void ScriptEngineV8::setThread(QThread* thread) { std::shared_ptr ScriptEngineV8::uncaughtException() const { - return _uncaughtException->clone(); + if (_uncaughtException) { + return _uncaughtException->clone(); + } else { + return std::shared_ptr(); + } } bool ScriptEngineV8::raiseException(const QString& error, const QString &reason) {