diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-09-03 10:30:10 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-10-03 14:49:01 +0000 |
| commit | 1d0b5d26ec382b5d6f18e1428fc248a57307473f (patch) | |
| tree | 49484b9c66193e10bdd233fcbcab6ae3aea75f92 /src/corelib/serialization/qjsondocument.cpp | |
| parent | 811c2567b6938edecfb8f8fbd9eb2e4946af301c (diff) | |
Handle errors when streaming QJsonDocument through QDataStream
Change-Id: I96df896d446e89dc4f9733a6cc6cec61a6826a1f
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qjsondocument.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 5647b771fb..aaa0f6acaa 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -47,6 +47,7 @@ #include "qjsonwriter_p.h" #include "qjsonparser_p.h" #include "qjson_p.h" +#include "qdatastream.h" QT_BEGIN_NAMESPACE @@ -680,7 +681,10 @@ QDataStream &operator>>(QDataStream &stream, QJsonDocument &doc) { QByteArray buffer; stream >> buffer; - doc = QJsonDocument::fromJson(buffer); + QJsonParseError parseError{}; + doc = QJsonDocument::fromJson(buffer, &parseError); + if (parseError.error && !buffer.isEmpty()) + stream.setStatus(QDataStream::ReadCorruptData); return stream; } #endif |