diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
| commit | 19ed7973a311a8d42d3a558bb551230e902ce9b9 (patch) | |
| tree | 9832c0cc796722f85579e25fd50cc38b65e6ef6c /src/qml/common/qqmljsfixedpoolarray_p.h | |
| parent | f5701f0def37fcc0c2b38ae9552eb3a896a34687 (diff) | |
| parent | a5635345175e667601c8b6a344508c4d4ebb0f9d (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I91d2b178e7111d0802ea973bccf230b264c30c96
Diffstat (limited to 'src/qml/common/qqmljsfixedpoolarray_p.h')
| -rw-r--r-- | src/qml/common/qqmljsfixedpoolarray_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h index b65b994d6c..15a8cd6878 100644 --- a/src/qml/common/qqmljsfixedpoolarray_p.h +++ b/src/qml/common/qqmljsfixedpoolarray_p.h @@ -86,7 +86,7 @@ public: if (QTypeInfo<T>::isComplex) { for (int i = 0; i < count; ++i) new (data + i) T(vector.at(i)); - } else { + } else if (count) { memcpy(data, static_cast<const void*>(vector.constData()), count * sizeof(T)); } } |