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

Ensure that the binary JSON objects are actually sorted

Browse Source 
QJsonObject requires that, since it does binary searches for the keys.

Change-Id: I8a7a116f51864cecb52fffff13bc24660c1cc1ac
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Thiago Macieira 2015-01-23 14:20:02 -08:00
parent 2be0d3088f
commit 0fa7374f1d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/json/qjson.cpp
View File

@ -200,6 +200,7 @@ bool Object::isValid() const
if (tableOffset + length*sizeof(offset) > size) if (tableOffset + length*sizeof(offset) > size)
return false; return false;
QString lastKey;
for (uint i = 0; i < length; ++i) { for (uint i = 0; i < length; ++i) {
offset entryOffset = table()[i]; offset entryOffset = table()[i];
if (entryOffset + sizeof(Entry) >= tableOffset) if (entryOffset + sizeof(Entry) >= tableOffset)
@ -208,8 +209,12 @@ bool Object::isValid() const
int s = e->size(); int s = e->size();
if (table()[i] + s > tableOffset) if (table()[i] + s > tableOffset)
return false; return false;
QString key = e->key();
if (key < lastKey)
return false;
if (!e->value.isValid(this)) if (!e->value.isValid(this))
return false; return false;
lastKey = key;
} }
return true; return true;
} }