Catch mis-use of "original" as default property value

This used to cause an infinite recursion, eventually crashing after
running out of stack space.

Change-Id: I073f7163d73a70b17bab078c8a99199bc9d21eaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index b7c2576df..18d7fd83f 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -177,6 +177,13 @@ private:
             QScriptValue originalValue;
             if (data->item->propertyDeclaration(propertyName->toString()).isScalar()) {
                 const Item *item = itemOfProperty;
+                if (item->type() == ItemType::Module || item->type() == ItemType::Export) {
+                    const QString errorMessage = Tr::tr("The special value 'original' cannot "
+                            "be used on the right-hand side of a property declaration.");
+                    extraScope = engine->currentContext()->throwError(errorMessage);
+                    result.second = false;
+                    return result;
+                }
                 while (item->type() == ItemType::ModuleInstance)
                     item = item->prototype();
                 if (item->type() != ItemType::Module && item->type() != ItemType::Export) {