diff -r e24348a560a6 -r b72c6db6890b src/corelib/tools/qvarlengtharray.h --- a/src/corelib/tools/qvarlengtharray.h Fri Jun 11 14:24:45 2010 +0300 +++ b/src/corelib/tools/qvarlengtharray.h Wed Jun 23 19:07:03 2010 +0300 @@ -128,9 +128,9 @@ friend class QPodList; void realloc(int size, int alloc); - int a; - int s; - T *ptr; + int a; // capacity + int s; // size + T *ptr; // data union { // ### Qt 5: Use 'Prealloc * sizeof(T)' as array size char array[sizeof(qint64) * (((Prealloc * sizeof(T)) / sizeof(qint64)) + 1)]; @@ -193,8 +193,8 @@ Q_ASSERT(aalloc >= asize); T *oldPtr = ptr; int osize = s; - // s = asize; + const int copySize = qMin(asize, osize); if (aalloc != a) { ptr = reinterpret_cast(qMalloc(aalloc * sizeof(T))); Q_CHECK_PTR(ptr); @@ -205,7 +205,6 @@ if (QTypeInfo::isStatic) { QT_TRY { // copy all the old elements - const int copySize = qMin(asize, osize); while (s < copySize) { new (ptr+s) T(*(oldPtr+s)); (oldPtr+s)->~T(); @@ -221,19 +220,19 @@ QT_RETHROW; } } else { - qMemCopy(ptr, oldPtr, qMin(asize, osize) * sizeof(T)); + qMemCopy(ptr, oldPtr, copySize * sizeof(T)); } } else { ptr = oldPtr; return; } } + s = copySize; if (QTypeInfo::isComplex) { + // destroy remaining old objects while (osize > asize) (oldPtr+(--osize))->~T(); - if (!QTypeInfo::isStatic) - s = osize; } if (oldPtr != reinterpret_cast(array) && oldPtr != ptr)