diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
| commit | 91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d (patch) | |
| tree | ef09bd890041b3c44f7be3322321c96174e94054 /src/corelib/tools/qbytearray.cpp | |
| parent | 687d50f05a1a2d9355f0990e845967930c57b985 (diff) | |
| parent | fe129a59ab54e6c0194c546a02bc64e886c252d5 (diff) | |
| download | Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.zip Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.gz Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index d2fbf5a..556093f 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -538,7 +538,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) forever { ulong alloc = len; - d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.data(), sizeof(QByteArray::Data) + alloc)))); + d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.take(), sizeof(QByteArray::Data) + alloc)))); if (!d) { // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS qWarning("qUncompress: could not allocate enough memory to uncompress data"); @@ -551,7 +551,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) switch (res) { case Z_OK: if (len != alloc) { - d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.data(), sizeof(QByteArray::Data) + len)))); + d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.take(), sizeof(QByteArray::Data) + len)))); if (!d) { // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS qWarning("qUncompress: could not allocate enough memory to uncompress data"); @@ -561,6 +561,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) d->ref = 1; d->alloc = d->size = len; d->data = d->array; + d->array[len] = 0; return QByteArray(d.take(), 0, 0); |