diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-01 20:27:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 21:04:27 +0200 |
| commit | 44062ea8e2499f8d2061c7e5be8fb754f2ba4310 (patch) | |
| tree | edd26efd35448867d91981caa337e3a85c59b318 /src/script/bridge/qscriptqobject.cpp | |
| parent | 48fca54118b65d6399ece5f258426144bdc2b03b (diff) | |
| download | qtscript-44062ea8e2499f8d2061c7e5be8fb754f2ba4310.tar.gz | |
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 <ogoffart@woboq.com>
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index cc4817a..962479f 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -32,6 +32,7 @@ #include "../api/qscriptable_p.h" #include "../api/qscriptcontext_p.h" #include "qscriptfunction_p.h" +#include "qscriptactivationobject_p.h" #include "Error.h" #include "PrototypeFunction.h" |