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

Fix data corruption regression in QJsonObject::erase()

Browse Source 
The internal removeAt(index) method was implemented as taking cbor
indexes directly, in contrast to the other ...At(index) methods.

Fixes: QTBUG-83695
Change-Id: I16597eb6db1cf71e1585c041caa81bf8f7a75303
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Eirik Aavitsland 2020-04-22 20:06:16 +02:00
parent 1e4801c7ce
commit 9e83d268d6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/serialization/qjsonobject.cpp
View File

@ -577,7 +577,7 @@ void QJsonObject::removeImpl(T key)
if (!keyExists) if (!keyExists)
return; return;
removeAt(index); removeAt(index / 2);
} }
#if QT_STRINGVIEW_LEVEL < 2 #if QT_STRINGVIEW_LEVEL < 2
@ -629,7 +629,7 @@ QJsonValue QJsonObject::takeImpl(T key)
return QJsonValue(QJsonValue::Undefined); return QJsonValue(QJsonValue::Undefined);
const QJsonValue v = QJsonPrivate::Value::fromTrustedCbor(o->extractAt(index + 1)); const QJsonValue v = QJsonPrivate::Value::fromTrustedCbor(o->extractAt(index + 1));
removeAt(index); removeAt(index / 2);
return v; return v;
} }
@ -1486,8 +1486,8 @@ void QJsonObject::setValueAt(int i, const QJsonValue &val)
void QJsonObject::removeAt(int index) void QJsonObject::removeAt(int index)
{ {
detach2(); detach2();
o->removeAt(index + 1); o->removeAt(2 * index + 1);
o->removeAt(index); o->removeAt(2 * index);
} }
uint qHash(const QJsonObject &object, uint seed) uint qHash(const QJsonObject &object, uint seed)

7
tests/auto/corelib/serialization/json/tst_qtjson.cpp
View File

@ -927,9 +927,16 @@ void tst_QtJson::testObjectIteration()
QCOMPARE(object, object2); QCOMPARE(object, object2);
QJsonObject::iterator it = object2.find(QString::number(5)); QJsonObject::iterator it = object2.find(QString::number(5));
QJsonValue val = *it;
object2.erase(it); object2.erase(it);
QCOMPARE(object.size(), 10); QCOMPARE(object.size(), 10);
QCOMPARE(object2.size(), 9); QCOMPARE(object2.size(), 9);
for (QJsonObject::const_iterator it = object2.constBegin(); it != object2.constEnd(); ++it) {
QJsonValue value = it.value();
QVERIFY(it.value() != val);
QCOMPARE((double)it.key().toInt(), value.toDouble());
}
} }
{ {