diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-07 13:21:09 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-26 20:42:39 +0200 |
| commit | a3389d6bf238c46816fd1133c1258102e36c4b10 (patch) | |
| tree | ddbaabaa2129a9e8f425aded7706ebb91e36c2c5 /src/qml/qml/qqmldata_p.h | |
| parent | 9240878b2e770dc81d22c51e95a3f6fd2e23acef (diff) | |
QML: Do not leak memory if QQmlData is manipulated from ctor
This creates another QQmlData object on the heap, which is rather
wasteful. However, we cannot really avoid it since it's all too easy to
trigger an operation like this.
If it happens, use the QQmlData it has created, and ignore the memory
we've allocated inline. While we're at it, make the memory ownership a
required argument to the ctor.
Pick-to: 6.5 6.6
Fixes: QTBUG-114186
Change-Id: I0568768c9ec13c94db79bb162c9eeb76f75f2a55
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmldata_p.h')
| -rw-r--r-- | src/qml/qml/qqmldata_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h index 5b7c05c61e..cc13cc7245 100644 --- a/src/qml/qml/qqmldata_p.h +++ b/src/qml/qml/qqmldata_p.h @@ -55,7 +55,9 @@ struct Binding; class Q_QML_PRIVATE_EXPORT QQmlData : public QAbstractDeclarativeData { public: - QQmlData(); + enum Ownership { DoesNotOwnMemory, OwnsMemory }; + + QQmlData(Ownership ownership); ~QQmlData(); static inline void init() { @@ -295,7 +297,7 @@ private: Q_NEVER_INLINE BindingBitsType *growBits(QObject *obj, int bit); - Q_DISABLE_COPY(QQmlData); + Q_DISABLE_COPY_MOVE(QQmlData); }; bool QQmlData::wasDeleted(const QObjectPrivate *priv) |