diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-04-11 23:01:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-11 23:01:43 +0200 |
| commit | 4c1e15548a288455a5a62dcefacd7c9a44736346 (patch) | |
| tree | 0273cad922b92b008870808fb67403131383313e /src/corelib/tools/qbytearray.h | |
| parent | c501eb8bece9c9de37f7f0839a8396fbfa697fec (diff) | |
| parent | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index b0a6971964..0a2f7a9e53 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -462,7 +462,7 @@ inline int QByteArray::capacity() const inline void QByteArray::reserve(int asize) { if (d->ref.isShared() || uint(asize) + 1u > d->alloc) { - reallocData(uint(asize) + 1u, d->detachFlags() | Data::CapacityReserved); + reallocData(qMax(uint(size()), uint(asize)) + 1u, d->detachFlags() | Data::CapacityReserved); } else { // cannot set unconditionally, since d could be the shared_null or // otherwise static |