diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-18 05:27:05 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-21 23:11:26 (GMT) |
| commit | b5d5be9db8ea0932b728fb9b90f61212c7cb6777 (patch) | |
| tree | 67a088dc4f5baefb2dfe127ed4bfdd487eef69a0 /src/declarative | |
| parent | 535172df73b539bf6468a96773ac28457e307792 (diff) | |
| download | Qt-b5d5be9db8ea0932b728fb9b90f61212c7cb6777.zip Qt-b5d5be9db8ea0932b728fb9b90f61212c7cb6777.tar.gz Qt-b5d5be9db8ea0932b728fb9b90f61212c7cb6777.tar.bz2 | |
Fix crash when calling createObject on a component with errors.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index a280d7e..8922751 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -511,6 +511,8 @@ QScriptValue QDeclarativeComponent::createObject() return QScriptValue(); } QObject* ret = create(ctxt); + if (!ret) + return QScriptValue(); QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine); QDeclarativeDeclarativeData::get(ret, true)->setImplicitDestructible(); return priv->objectClass->newQObject(ret, QMetaType::QObjectStar); |