1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't access QArrayData::sharedNull() from QByteArray anymore

Browse Source 
Change-Id: I1292f8d2d62fa96ae4c6aa91c7c95c1f3a18570f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Lars Knoll 2019-11-16 16:29:29 +01:00
parent fae7a47bb3
commit 88c72d972a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1209,13 +1209,11 @@ QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
QByteArray &QByteArray::operator=(const char *str) QByteArray &QByteArray::operator=(const char *str)
{ {
if (!str || !*str) { if (!str || !*str) {
QPair<Data *, char *> pair;
if (!str) { if (!str) {
pair = qMakePair(Data::sharedNull(), Data::sharedNullData()); d.clear();
} else { } else {
pair = Data::allocate(0); d = QByteArrayData(Data::allocate(0), 0);
} }
d = QByteArrayData(pair.first, pair.second, 0);
} else { } else {
const int len = int(strlen(str)); const int len = int(strlen(str));
const uint fullLen = uint(len) + 1; const uint fullLen = uint(len) + 1;