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>

1 files changed, 26 insertions, 0 deletions

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");