From df25927a6827c0abce6d35440359a835d23226f7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 5 Sep 2014 13:26:16 +0200 Subject: Don't accept json strings with trailing garbage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A well formed JSON document is not allowed to contain trailing garbage at the end. Don't accept this in the parser. Task-number: QTBUG-40062 Change-Id: I0a09dbd099a8c643f58023342546c4e67d026fec Reviewed-by: Jędrzej Nowacki --- tests/auto/corelib/json/tst_qtjson.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index ba19e4855d..253741c103 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -151,6 +151,7 @@ private Q_SLOTS: void objectInitializerList(); void unicodeKeys(); + void garbageAtEnd(); private: QString testDataDir; }; @@ -2777,5 +2778,18 @@ void tst_QtJson::unicodeKeys() } } +void tst_QtJson::garbageAtEnd() +{ + QJsonParseError error; + QJsonDocument doc = QJsonDocument::fromJson("{},", &error); + QVERIFY(error.error == QJsonParseError::GarbageAtEnd); + QVERIFY(error.offset == 2); + QVERIFY(doc.isEmpty()); + + doc = QJsonDocument::fromJson("{} ", &error); + QVERIFY(error.error == QJsonParseError::NoError); + QVERIFY(!doc.isEmpty()); +} + QTEST_MAIN(tst_QtJson) #include "tst_qtjson.moc" -- cgit v1.2.3