FCL/sf/mw/qt: comparison src/corelib/tools/qbytearray.cpp

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
 ulong len = qMax(expectedSize, 1ul);
 QScopedPointer<QByteArray::Data, QScopedPointerPodDeleter> d;
 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");
 return QByteArray();
 }
 (uchar*)data+4, nbytes-4);
 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");
 return QByteArray();
 }
 }
 d->ref = 1;
 d->alloc = d->size = len;
 d->data = d->array;
+d->array[len] = 0;
 return QByteArray(d.take(), 0, 0);
 case Z_MEM_ERROR:
 qWarning("qUncompress: Z_MEM_ERROR: Not enough memory");
 Returns the number of bytes in this byte array.
 The last byte in the byte array is at position size() - 1. In
 addition, QByteArray ensures that the byte at position size() is
 always '\\0', so that you can use the return value of data() and
-constData() as arguments to functions that expect
+constData() as arguments to functions that expect '\\0'-terminated
-'\\0'-terminated strings.
+strings.
 Example:
 \snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 6
 \sa isEmpty(), resize()
 /*! \fn char *QByteArray::data()
 Returns a pointer to the data stored in the byte array. The
 pointer can be used to access and modify the bytes that compose
-the array. The data is '\\0'-terminated.
+the array. The data is '\\0'-terminated, i.e. the number of
+bytes in the returned character string is size() + 1 for the
+'\\0' terminator.
 Example:
 \snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 8
 The pointer remains valid as long as the byte array isn't
 reallocated or destroyed. For read-only access, constData() is
 faster because it never causes a \l{deep copy} to occur.
 This function is mostly useful to pass a byte array to a function
 that accepts a \c{const char *}.
+The following example makes a copy of the char* returned by
+data(), but it will corrupt the heap and cause a crash because it
+does not allocate a byte for the '\\0' at the end:
+\snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 46
+This one allocates the correct amount of space:
+\snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 47
 Note: A QByteArray can store any byte values including '\\0's,
 but most functions that take \c{char *} arguments assume that the
 data ends at the first '\\0' they encounter.
 Appends the first \a len characters of the string \a str to this byte
 array and returns a reference to this byte array.
 If \a len is negative, the length of the string will be determined
-automatically using qstrlen(). If \a len is zero or the length of the
+automatically using qstrlen(). If \a len is zero or \a str is
-string is zero, nothing will be appended to the byte array.
+null, nothing is appended to the byte array. Ensure that \a len is
+\e not longer than \a str.
 */
 QByteArray &QByteArray::append(const char *str, int len)
 {
 if (len < 0)

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 30	5dc02b23752f