diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-02-15 10:44:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-09 10:20:21 +0200 |
| commit | e1d3687d64a19d27448b3f8247505daa99261ea1 (patch) | |
| tree | 3792e67b42c833a4a8765f952d4d3f2a2fb4fa63 /src/corelib/json/qjsondocument.h | |
| parent | 9cc106d9d7d951fcf30f4b0f8606afa6b50892ec (diff) | |
Fix crashes when creating large documents
Compact an object in regular intervals when inserting
data into it, to avoid the object becoming huge.
Compact an object/array before inserting into another
array or object.
Check that the document doesn't get so big it's overflowing
the internal data structures.
Task-number: QTBUG-29288
Change-Id: Id39d80dac1e7d5a11f40819f41b4b336bce16947
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/json/qjsondocument.h')
| -rw-r--r-- | src/corelib/json/qjsondocument.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/json/qjsondocument.h index 4d4f3885dc..0354262e2c 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/json/qjsondocument.h @@ -67,7 +67,8 @@ struct Q_CORE_EXPORT QJsonParseError IllegalUTF8String, UnterminatedString, MissingObject, - DeepNesting + DeepNesting, + DocumentTooLarge }; QString errorString() const; |