diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
| commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
| tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /src/corelib/tools/qvarlengtharray.h | |
| parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
| parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'src/corelib/tools/qvarlengtharray.h')
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 5d0231417b..d99eebd4b9 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -361,6 +361,7 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a int osize = s; const int copySize = qMin(asize, osize); + Q_ASSUME(copySize >= 0); if (aalloc != a) { if (aalloc > Prealloc) { T* newPtr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T))); |