whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qUncompress: mark invalidCompressedData() Q_DECL_COLD_FUNCTION 

... and in turn remove the manual Q_UNLIKELY() leading to its callers.

Paths to Q_DECL_COLD_FUNCTIONs are implicitly [[unlikely]].

This is in preparation of changes where the extra Q_UNLIKELY markup
gets in the way.

Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-104972
Change-Id: I2cba5103854bf356ed841e1957a5ef143f8d3823
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2022-09-07 16:32:11 +02:00
parent 1032bf9fdb
commit 936d33849c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/text/qbytearray.cpp
View File

@ -602,6 +602,7 @@ QByteArray qCompress(const uchar* data, qsizetype nbytes, int compressionLevel)
*/
#ifndef QT_NO_COMPRESS
Q_DECL_COLD_FUNCTION
static QByteArray invalidCompressedData()
{
qWarning("qUncompress: Input data is corrupted");
@ -632,13 +633,13 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
(data[2] << 8) | (data[3] ));
size_t len = qMax(expectedSize, 1ul);
constexpr size_t maxPossibleSize = MaxAllocSize - sizeof(QByteArray::Data);
if (Q_UNLIKELY(len >= maxPossibleSize)) {
if (len >= maxPossibleSize) {
// QByteArray does not support that huge size anyway.
return invalidCompressedData();
}
QByteArray::DataPointer d(QByteArray::Data::allocate(len));
if (Q_UNLIKELY(d.data() == nullptr))
if (d.data() == nullptr) // allocation failed
return invalidCompressedData();
forever {
@ -663,13 +664,13 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
static_assert(maxPossibleSize <= (std::numeric_limits<decltype(len)>::max)() / 2,
"oops, next line may overflow");
len *= 2;
if (Q_UNLIKELY(len >= maxPossibleSize)) {
if (len >= maxPossibleSize) {
// QByteArray does not support that huge size anyway.
return invalidCompressedData();
} else {
// grow the block
d->reallocate(d->allocatedCapacity()*2, QArrayData::Grow);
if (Q_UNLIKELY(d.data() == nullptr))
if (d.data() == nullptr) // reallocation failed
return invalidCompressedData();
}
continue;