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

QCborStreamReader: refactor readStringChunk_unicode() to append 

It was always overwriting the QString, while readStringChunk_byte() was
appending to the QByteArray. The appending was used by QCborValue, which
appends byte and text strings to its QByteArray in QCborContainerPrivate, but
keeps the UTF-8 encoding for simplicity sake.

I will need the QString appending for the next commit.

Change-Id: Icfe44ecf285a480fafe4fffd174c6a89e91cef74
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Thiago Macieira 2023-03-14 15:45:01 -07:00
parent d201c0a218
commit 23a1ac7d40
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/corelib/serialization/qcborstreamreader.cpp
View File

@ -1587,24 +1587,25 @@ QCborStreamReaderPrivate::readStringChunk_byte(ReadStringChunk params, qsizetype
inline qsizetype
QCborStreamReaderPrivate::readStringChunk_unicode(ReadStringChunk params, qsizetype utf8len)
{
Q_ASSERT(params.isString());
// See QUtf8::convertToUnicode() a detailed explanation of why this
// conversion uses the same number of words or less.
QChar *begin = nullptr;
if (params.isString()) {
QT_TRY {
params.string->resize(utf8len);
} QT_CATCH (const std::bad_alloc &) {
if (utf8len > MaxStringSize)
handleError(CborErrorDataTooLarge);
else
handleError(CborErrorOutOfMemory);
return -1;
}
begin = const_cast<QChar *>(params.string->constData());
qsizetype currentSize = params.string->size();
size_t newSize = size_t(utf8len) + size_t(currentSize); // can't overflow
if (utf8len > MaxStringSize || qsizetype(newSize) < 0) {
handleError(CborErrorDataTooLarge);
return -1;
}
QT_TRY {
params.string->resize(qsizetype(newSize));
} QT_CATCH (const std::bad_alloc &) {
handleError(CborErrorOutOfMemory);
return -1;
}
QChar *ptr = begin;
QChar *begin = const_cast<QChar *>(params.string->constData());
QChar *ptr = begin + currentSize;
QStringConverter::State cs(QStringConverter::Flag::Stateless);
if (device == nullptr) {
// Easy case: we can decode straight from the buffer we already have
@ -1636,9 +1637,8 @@ QCborStreamReaderPrivate::readStringChunk_unicode(ReadStringChunk params, qsizet
}
qsizetype size = ptr - begin;
if (params.isString())
params.string->truncate(size);
return size;
params.string->truncate(ptr - begin);
return size - currentSize; // how many bytes we added
}
QT_END_NAMESPACE