diff options
| author |   Marc Mutz <marc.mutz@qt.io> | 2023-02-16 08:25:40 +0100 |
|---|---|---|
| committer |   Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-16 13:38:42 +0000 |
| commit | 2fef5514d32440a7ab35cdc1ae928e3bb6438492 (patch) | |
| tree | 81718980eac9f24324fbdc7a7ccd2f220a6fe0e2 | |
| parent | Fix QStatusBar::removeWidget to hide the right widget (diff) | |
| download | qtbase-2fef5514d32440a7ab35cdc1ae928e3bb6438492.tar.xz qtbase-2fef5514d32440a7ab35cdc1ae928e3bb6438492.zip | |
QVarLengthArray: protect against aliasing in resize(n, t)
Amends a00a1d8806cfbf17e04b88d1b4ff4a9cf5b6294a.
Change-Id: I3fa6183466715555530d4042006049e286897343
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 0cfaa6e8964a0458cca20ce686b6a399293ad4cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 9fa8990dbb..6b3c90c371 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -218,6 +218,10 @@ protected: void reallocate_impl(qsizetype prealloc, void *array, qsizetype size, qsizetype alloc); void resize_impl(qsizetype prealloc, void *array, qsizetype sz, const T &v) { + if (QtPrivate::q_points_into_range(&v, begin(), end())) { + resize_impl(prealloc, array, sz, T(v)); + return; + } reallocate_impl(prealloc, array, sz, qMax(sz, capacity())); while (size() < sz) { new (data() + size()) T(v); |