2 files changed, 31 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
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index c6faf8c7d5..a689b0b620 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -135,6 +135,8 @@ private slots:
 
     void stream_QByteArray2();
 
+    void stream_QJsonDocument();
+
     void setVersion_data();
     void setVersion();
 
@@ -2095,6 +2097,30 @@ void tst_QDataStream::stream_QByteArray2()
     }
 }
 
+void tst_QDataStream::stream_QJsonDocument()
+{
+    QByteArray buffer;
+    {
+        QDataStream save(&buffer, QIODevice::WriteOnly);
+        save << QByteArrayLiteral("invalidJson");
+        QDataStream load(&buffer, QIODevice::ReadOnly);
+        QJsonDocument doc;
+        load >> doc;
+        QVERIFY(doc.isEmpty());
+        QVERIFY(load.status() != QDataStream::Ok);
+        QCOMPARE(load.status(), QDataStream::ReadCorruptData);
+    }
+    {
+        QDataStream save(&buffer, QIODevice::WriteOnly);
+        QJsonDocument docSave(QJsonArray{1,2,3});
+        save << docSave;
+        QDataStream load(&buffer, QIODevice::ReadOnly);
+        QJsonDocument docLoad;
+        load >> docLoad;
+        QCOMPARE(docLoad, docSave);
+    }
+}
+
 void tst_QDataStream::setVersion_data()
 {
     QTest::addColumn<int>("vers");