[new compiler] Add the correct object index to the custom parser

Without the correct index the calls to astForBinding run out of bounds. Fixes
tst_qqmllistmodel crash.

Change-Id: I6fb8b77866cbf247e7373cdbece6833c92be3615
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

4 files changed, 11 insertions, 10 deletions

diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index b8920deb21..70f859ffe2 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -251,8 +251,9 @@ QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
     return rv;
 }
 
-QByteArray QQmlConnectionsParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props)
+QByteArray QQmlConnectionsParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList<const QV4::CompiledData::Binding *> &props)
 {
+    Q_UNUSED(objectIndex)
     QByteArray rv;
     QDataStream ds(&rv, QIODevice::WriteOnly);
 
diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index 2579e4c239..cb436b1eb4 100644
--- a/src/qml/types/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
@@ -85,7 +85,7 @@ class QQmlConnectionsParser : public QQmlCustomParser
 {
 public:
     virtual QByteArray compile(const QList<QQmlCustomParserProperty> &);
-    virtual QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props);
+    virtual QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList<const QV4::CompiledData::Binding *> &props);
     virtual void setCustomData(QObject *, const QByteArray &);
 };
 
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 0dc1c2c25c..fbf3c091c2 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2385,10 +2385,10 @@ bool QQmlListModelParser::compileProperty(const QQmlCustomParserProperty &prop,
     return true;
 }
 
-bool QQmlListModelParser::compileProperty(const QV4::CompiledData::QmlUnit *qmlUnit, const QV4::CompiledData::Binding *binding, QList<QQmlListModelParser::ListInstruction> &instr, QByteArray &data)
+bool QQmlListModelParser::compileProperty(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QV4::CompiledData::Binding *binding, QList<QQmlListModelParser::ListInstruction> &instr, QByteArray &data)
 {
-    const quint32 targetObjectIndex = binding->value.objectIndex;
     if (binding->type >= QV4::CompiledData::Binding::Type_Object) {
+        const quint32 targetObjectIndex = binding->value.objectIndex;
         const QV4::CompiledData::Object *target = qmlUnit->objectAt(targetObjectIndex);
         QString objName = qmlUnit->header.stringAt(target->inheritedTypeNameIndex);
         if (objName != listElementTypeName) {
@@ -2427,7 +2427,7 @@ bool QQmlListModelParser::compileProperty(const QV4::CompiledData::QmlUnit *qmlU
             li.dataIdx = ref;
             instr << li;
 
-            if (!compileProperty(qmlUnit, binding, instr, data))
+            if (!compileProperty(qmlUnit, targetObjectIndex, binding, instr, data))
                 return false;
 
             li.type = ListInstruction::Pop;
@@ -2466,7 +2466,7 @@ bool QQmlListModelParser::compileProperty(const QV4::CompiledData::QmlUnit *qmlU
                 int v = evaluateEnum(script, &ok);
                 if (!ok) {
                     using namespace QQmlJS;
-                    AST::Node *node = astForBinding(targetObjectIndex, binding->value.compiledScriptIndex);
+                    AST::Node *node = astForBinding(objectIndex, binding->value.compiledScriptIndex);
                     if (AST::ExpressionStatement *stmt = AST::cast<AST::ExpressionStatement*>(node))
                         node = stmt->expression;
                     AST::StringLiteral *literal = 0;
@@ -2552,7 +2552,7 @@ QByteArray QQmlListModelParser::compile(const QList<QQmlCustomParserProperty> &c
     return rv;
 }
 
-QByteArray QQmlListModelParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings)
+QByteArray QQmlListModelParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList<const QV4::CompiledData::Binding *> &bindings)
 {
     QList<ListInstruction> instr;
     QByteArray data;
@@ -2564,7 +2564,7 @@ QByteArray QQmlListModelParser::compile(const QV4::CompiledData::QmlUnit *qmlUni
             error(binding, QQmlListModel::tr("ListModel: undefined property '%1'").arg(propName));
             return QByteArray();
         }
-        if (!compileProperty(qmlUnit, binding, instr, data))
+        if (!compileProperty(qmlUnit, objectIndex, binding, instr, data))
             return QByteArray();
     }
 
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index 172d857687..1fd57f063c 100644
--- a/src/qml/types/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
@@ -160,7 +160,7 @@ class QQmlListModelParser : public QQmlCustomParser
 public:
     QQmlListModelParser() : QQmlCustomParser(QQmlCustomParser::AcceptsSignalHandlers) {}
     QByteArray compile(const QList<QQmlCustomParserProperty> &);
-    QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
+    QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList<const QV4::CompiledData::Binding *> &bindings);
     void setCustomData(QObject *, const QByteArray &);
 
 private:
@@ -176,7 +176,7 @@ private:
         ListInstruction *instructions() const;
     };
     bool compileProperty(const QQmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data);
-    bool compileProperty(const QV4::CompiledData::QmlUnit *qmlUnit, const QV4::CompiledData::Binding *binding, QList<ListInstruction> &instr, QByteArray &data);
+    bool compileProperty(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QV4::CompiledData::Binding *binding, QList<ListInstruction> &instr, QByteArray &data);
 
     bool definesEmptyList(const QString &);