From 7cd6a4d78fabcec0197fb62b5a1458f3d9916fd8 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Mon, 11 Nov 2013 08:51:08 +0100
Subject: don't throw exceptions through script engine

Task-number: QBS-452

Change-Id: I199c77236196f60cad485999f7b909976a6dd90d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
 src/lib/jsextensions/moduleproperties.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/lib/jsextensions/moduleproperties.cpp b/src/lib/jsextensions/moduleproperties.cpp
index 0f2833754..86297a3eb 100644
--- a/src/lib/jsextensions/moduleproperties.cpp
+++ b/src/lib/jsextensions/moduleproperties.cpp
@@ -33,6 +33,7 @@
 #include <language/language.h>
 #include <language/scriptengine.h>
 #include <logging/translator.h>
+#include <tools/error.h>
 #include <tools/propertyfinder.h>
 
 #include <QScriptEngine>
@@ -70,12 +71,20 @@ void ModuleProperties::init(QScriptValue objectWithProperties, const void *ptr,
 
 QScriptValue ModuleProperties::js_moduleProperties(QScriptContext *context, QScriptEngine *engine)
 {
-    return moduleProperties(context, engine, false);
+    try {
+        return moduleProperties(context, engine, false);
+    } catch (const ErrorInfo &e) {
+        return context->throwError(e.toString());
+    }
 }
 
 QScriptValue ModuleProperties::js_moduleProperty(QScriptContext *context, QScriptEngine *engine)
 {
-    return moduleProperties(context, engine, true);
+    try {
+        return moduleProperties(context, engine, true);
+    } catch (const ErrorInfo &e) {
+        return context->throwError(e.toString());
+    }
 }
 
 QScriptValue ModuleProperties::moduleProperties(QScriptContext *context, QScriptEngine *engine,
-- 
cgit v1.2.1