Throw a type error if the super class is not a constructor

Change-Id: I1cf83c73ea1b628f44845e1b9ea324d3e069c344
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index edaa0a8e63..3317003ea4 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -917,11 +917,12 @@ ReturnedValue Runtime::method_loadSuperConstructor(ExecutionEngine *engine, cons
         return engine->throwReferenceError(QStringLiteral("super() already called."), QString(), 0, 0); // ### fix line number
     }
     const FunctionObject *f = t.as<FunctionObject>();
-    if (!f || !f->isConstructor()) {
-        engine->throwTypeError();
-        return Encode::undefined();
-    }
-    return static_cast<const Object &>(t).getPrototypeOf()->asReturnedValue();
+    if (!f)
+        return engine->throwTypeError();
+    Heap::Object *c = static_cast<const Object &>(t).getPrototypeOf();
+    if (!c->vtable()->isFunctionObject || !static_cast<Heap::FunctionObject *>(c)->isConstructor())
+        return engine->throwTypeError();
+    return c->asReturnedValue();
 }