diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-06 09:53:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 04:01:19 +0200 |
| commit | 19c0a31319148d4ac716f7cb3295891b5a3b20d9 (patch) | |
| tree | ec01ac1d68d4888c58a4f3b4f547a287a4c7491d /src/qml/qml/qqmlcomponent_p.h | |
| parent | 49a3883e86b61d8facfeea9c43037d484cb50b92 (diff) | |
Do not permit excessive recursion in component creation
Limit recursion during component creation to prevent infinite
recursion resulting in a crash. Recursion results from invoking
createObject() in the Component.onCompleted handler.
Task-number: QTBUG-25439
Change-Id: Ica2ba099d82b5747c938501af04e67f7ace8402e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcomponent_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h index 9e220b5e95..f5589b9003 100644 --- a/src/qml/qml/qqmlcomponent_p.h +++ b/src/qml/qml/qqmlcomponent_p.h @@ -84,7 +84,8 @@ class Q_QML_PRIVATE_EXPORT QQmlComponentPrivate : public QObjectPrivate, public Q_DECLARE_PUBLIC(QQmlComponent) public: - QQmlComponentPrivate() : typeData(0), progress(0.), start(-1), cc(0), engine(0), creationContext(0), profiler(0) {} + QQmlComponentPrivate() + : typeData(0), progress(0.), start(-1), cc(0), engine(0), creationContext(0), profiler(0), depthIncreased(false) {} void loadUrl(const QUrl &newUrl, QQmlComponent::CompilationMode mode = QQmlComponent::PreferSynchronous); @@ -120,6 +121,7 @@ public: QQmlEngine *engine; QQmlGuardedContextData creationContext; QQmlObjectCreatingProfiler *profiler; + bool depthIncreased; void clear(); |