diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-07-02 20:45:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 06:20:07 +0200 |
commit | ba87568655dad3e830e692109b5e571ae78b71a0 (patch) | |
tree | c9fb40d7ebdd75d8787794b6ae31f7b7f0ab610f /src/corelib/statemachine | |
parent | 482205d847a15e2afc7988c1792aaeb37e71505f (diff) |
statemachine: Don't crash if property assignment target is deleted
Do like QPropertyAnimation and store the QObject in a QPointer.
Purge the assignments list upon state entry and property restore.
Change-Id: I54a56885a2905178ab6aa5cf292b3d25c86b7a97
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r-- | src/corelib/statemachine/qstate_p.h | 6 | ||||
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 40 | ||||
-rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 3 |
3 files changed, 36 insertions, 13 deletions
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h index 30be47cf51..9558bd88a5 100644 --- a/src/corelib/statemachine/qstate_p.h +++ b/src/corelib/statemachine/qstate_p.h @@ -57,6 +57,7 @@ #include <QtCore/qlist.h> #include <QtCore/qbytearray.h> +#include <QtCore/qpointer.h> #include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -69,7 +70,10 @@ struct QPropertyAssignment const QVariant &v, bool es = true) : object(o), propertyName(n), value(v), explicitlySet(es) {} - QObject *object; + + bool objectDeleted() const { return !object; } + + QPointer<QObject> object; QByteArray propertyName; QVariant value; bool explicitlySet; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 3d0b1e92fd..24da4e6937 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -176,6 +176,10 @@ QT_BEGIN_NAMESPACE // #define QSTATEMACHINE_DEBUG +template <class T> +static uint qHash(const QPointer<T> &p) +{ return qHash(p.data()); } + QStateMachinePrivate::QStateMachinePrivate() { isMachine = true; @@ -666,14 +670,20 @@ void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &tr if (!s) continue; - QList<QPropertyAssignment> assignments = QStatePrivate::get(s)->propertyAssignments; - for (int j = 0; j < assignments.size(); ++j) { - const QPropertyAssignment &assn = assignments.at(j); - if (globalRestorePolicy == QStateMachine::RestoreProperties) { - registerRestorable(assn.object, assn.propertyName); + { + QList<QPropertyAssignment> &assignments = QStatePrivate::get(s)->propertyAssignments; + for (int j = 0; j < assignments.size(); ++j) { + const QPropertyAssignment &assn = assignments.at(j); + if (assn.objectDeleted()) { + assignments.removeAt(j--); + } else { + if (globalRestorePolicy == QStateMachine::RestoreProperties) { + registerRestorable(assn.object, assn.propertyName); + } + pendingRestorables.remove(RestorableId(assn.object, assn.propertyName)); + propertyAssignmentsForState[s].append(assn); + } } - pendingRestorables.remove(RestorableId(assn.object, assn.propertyName)); - propertyAssignmentsForState[s].append(assn); } // Remove pending restorables for all parent states to avoid restoring properties @@ -681,12 +691,16 @@ void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &tr // assign a property which is assigned by the parent, it inherits the parent's assignment. QState *parentState = s; while ((parentState = parentState->parentState()) != 0) { - assignments = QStatePrivate::get(parentState)->propertyAssignments; + QList<QPropertyAssignment> &assignments = QStatePrivate::get(parentState)->propertyAssignments; for (int j=0; j<assignments.size(); ++j) { const QPropertyAssignment &assn = assignments.at(j); - int c = pendingRestorables.remove(RestorableId(assn.object, assn.propertyName)); - if (c > 0) - propertyAssignmentsForState[s].append(assn); + if (assn.objectDeleted()) { + assignments.removeAt(j--); + } else { + int c = pendingRestorables.remove(RestorableId(assn.object, assn.propertyName)); + if (c > 0) + propertyAssignmentsForState[s].append(assn); + } } } } @@ -967,6 +981,10 @@ QList<QPropertyAssignment> QStateMachinePrivate::restorablesToPropertyList(const QHash<RestorableId, QVariant>::const_iterator it; for (it = restorables.constBegin(); it != restorables.constEnd(); ++it) { // qDebug() << "restorable:" << it.key().first << it.key().second << it.value(); + if (!it.key().first) { + // Property object was deleted + continue; + } result.append(QPropertyAssignment(it.key().first, it.key().second, it.value(), /*explicitlySet=*/false)); } return result; diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index ae5660719f..6159107dc0 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -60,6 +60,7 @@ #include <QtCore/qlist.h> #include <QtCore/qmutex.h> #include <QtCore/qpair.h> +#include <QtCore/qpointer.h> #include <QtCore/qset.h> #include <QtCore/qvector.h> #include <private/qfreelist_p.h> @@ -183,7 +184,7 @@ public: void cancelAllDelayedEvents(); #ifndef QT_NO_PROPERTIES - typedef QPair<QObject *, QByteArray> RestorableId; + typedef QPair<QPointer<QObject>, QByteArray> RestorableId; QHash<RestorableId, QVariant> registeredRestorables; void registerRestorable(QObject *object, const QByteArray &propertyName); void unregisterRestorable(QObject *object, const QByteArray &propertyName); |