From 44062ea8e2499f8d2061c7e5be8fb754f2ba4310 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 1 Jun 2012 20:27:05 +0200 Subject: Fix crash when accessing QObject properties through activation object Since objects in the scope chain have to be JSActivationObjects, QScriptContext::setActivationObject() creates a proxy object that should delegate access to the actual object. This case was not handled in the toQObject() conversion function, so for activation property access through evaluation (where the this-object would be the proxy object, not the actual QObject), the this-object conversion to QObject would fail, and the assert "this-object must be a QObject" was triggered. Task-number: QTBUG-21760 Change-Id: I40e868d9717ec76e0df18d5848c6ad99546ba34f Reviewed-by: Olivier Goffart --- tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests') diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index 3c97aef..d4c4caf 100644 --- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -584,6 +584,7 @@ private slots: void nestedArrayAsSlotArgument(); void nestedObjectAsSlotArgument_data(); void nestedObjectAsSlotArgument(); + void propertyAccessThroughActivationObject(); private: QScriptEngine *m_engine; @@ -3654,5 +3655,22 @@ void tst_QScriptExtQObject::nestedObjectAsSlotArgument() } } +// QTBUG-21760 +void tst_QScriptExtQObject::propertyAccessThroughActivationObject() +{ + QScriptContext *ctx = m_engine->pushContext(); + ctx->setActivationObject(m_engine->newQObject(m_myObject)); + + QVERIFY(m_engine->evaluate("intProperty").isNumber()); + QVERIFY(m_engine->evaluate("mySlot()").isUndefined()); + QVERIFY(m_engine->evaluate("mySlotWithStringArg('test')").isUndefined()); + + QVERIFY(m_engine->evaluate("dynamicProperty").isError()); + m_myObject->setProperty("dynamicProperty", 123); + QCOMPARE(m_engine->evaluate("dynamicProperty").toInt32(), 123); + + m_engine->popContext(); +} + QTEST_MAIN(tst_QScriptExtQObject) #include "tst_qscriptextqobject.moc" -- cgit v1.2.1