diff options
| author | Leonard Lee <leonard.lee@digia.com> | 2013-07-11 09:15:15 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-15 11:46:02 (GMT) |
| commit | 9cfac2e38cde24a2fbca4c1cebcf7a771443894a (patch) | |
| tree | 64abf420055ac0fe4f1c51875e3b19e32a5ae264 | |
| parent | ad4c35da48286ecf78ebc4eac539a7c70e2a15a1 (diff) | |
| download | Qt-9cfac2e38cde24a2fbca4c1cebcf7a771443894a.zip Qt-9cfac2e38cde24a2fbca4c1cebcf7a771443894a.tar.gz Qt-9cfac2e38cde24a2fbca4c1cebcf7a771443894a.tar.bz2 | |
Validate qmlEngine() in QDeclarativeItem::mapToItem() function.
We protect against the fact that engineForScript() can be
called with 0 or something else.
Task-number: QTBUG-29572
Change-Id: I92f62b328d1e84a378449e0857569886f327077c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 118fa06..7410c62 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -311,7 +311,7 @@ public: static QScriptValue formatTime(QScriptContext*, QScriptEngine*); static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*); #endif - static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; } + static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { if (!e) return 0; return &e->d_func()->scriptEngine; } static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p->q_func(); } static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); } static QDeclarativeEnginePrivate *get(QDeclarativeContext *c) { return (c && c->engine()) ? QDeclarativeEnginePrivate::get(c->engine()) : 0; } |