Fix crash when "original" is being misused

We simply assumed the value would be a module property.

Task-number: QBS-1255
Change-Id: I3994f6db62f64ed44cb4d01f0938bc2d536fb3f3
Reviewed-by: Jake Petroules <jake.petroules@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 cb88788f6..be99a53a2 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -176,6 +176,13 @@ private:
                 const Item *item = itemOfProperty;
                 while (item->type() == ItemType::ModuleInstance)
                     item = item->prototype();
+                if (item->type() != ItemType::Module && item->type() != ItemType::Export) {
+                    const QString errorMessage = Tr::tr("The special value 'original' can only "
+                                                        "be used with module properties.");
+                    extraScope = engine->currentContext()->throwError(errorMessage);
+                    result.second = false;
+                    return result;
+                }
                 SVConverter converter(scriptClass, object, item->property(*propertyName), item,
                                       propertyName, data, &originalValue);
                 converter.start();