diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-11-04 11:09:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-09 17:35:54 +0100 |
| commit | 13fcd02ff906a00593fabffe3620348da8e42755 (patch) | |
| tree | db48ff8c00c596f31609b3ed6fd8f2dc570e16e5 /src/corelib/tools/qarraydatapointer.h | |
| parent | 837a29b0b92c72b7b9d66a427c24a9fa8037f4f4 (diff) | |
Avoid crashes when calling squeeze()
Avoid crashes when calling squeeze() on a QList with non zero capacity
but zero size.
Change-Id: Id470b2d52266a345b94bc3dc5483f4668fbb57dc
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qarraydatapointer.h')
| -rw-r--r-- | src/corelib/tools/qarraydatapointer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index f6e556597f..27b5b1ae74 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -187,7 +187,7 @@ public: qsizetype detachCapacity(qsizetype newSize) const noexcept { return d ? d->detachCapacity(newSize) : newSize; } const typename Data::ArrayOptions flags() const noexcept { return d ? typename Data::ArrayOption(d->flags) : Data::ArrayOptionDefault; } void setFlag(typename Data::ArrayOptions f) noexcept { Q_ASSERT(d); d->flags |= f; } - void clearFlag(typename Data::ArrayOptions f) noexcept { Q_ASSERT(d); d->flags &= ~f; } + void clearFlag(typename Data::ArrayOptions f) noexcept { if (d) d->flags &= ~f; } Data *d_ptr() noexcept { return d; } void setBegin(T *begin) noexcept { ptr = begin; } |