diff options
| -rw-r--r-- | src/corelib/json/qjson_p.h | 1 | ||||
| -rw-r--r-- | src/corelib/json/qjsonwriter.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/corelib/json/tst_qtjson.cpp | 30 |
3 files changed, 38 insertions, 2 deletions
diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h index 81439a00ce..8d6735273c 100644 --- a/src/corelib/json/qjson_p.h +++ b/src/corelib/json/qjson_p.h @@ -60,6 +60,7 @@ #include <qatomic.h> #include <qstring.h> #include <qendian.h> +#include <qnumeric.h> #include <limits.h> diff --git a/src/corelib/json/qjsonwriter.cpp b/src/corelib/json/qjsonwriter.cpp index 76f62241e3..c284f76cbb 100644 --- a/src/corelib/json/qjsonwriter.cpp +++ b/src/corelib/json/qjsonwriter.cpp @@ -169,9 +169,14 @@ static void valueToJson(const QJsonPrivate::Base *b, const QJsonPrivate::Value & case QJsonValue::Bool: json += v.toBoolean() ? "true" : "false"; break; - case QJsonValue::Double: - json += QByteArray::number(v.toDouble(b)); + case QJsonValue::Double: { + const double d = v.toDouble(b); + if (qIsFinite(d)) + json += QByteArray::number(d); + else + json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4) break; + } case QJsonValue::String: json += '"'; json += escapedString(v.toString(b)); diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index 6811551769..7cdf6deb87 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -44,6 +44,7 @@ #include "qjsonobject.h" #include "qjsonvalue.h" #include "qjsondocument.h" +#include <limits> #define INVALID_UNICODE "\357\277\277" // "\uffff" #define UNICODE_DJE "\320\202" // Character from the Serbian Cyrillic alphabet @@ -94,6 +95,7 @@ private Q_SLOTS: void toVariantList(); void toJson(); + void toJsonSillyNumericValues(); void fromJson(); void fromJsonErrors(); void fromBinary(); @@ -1080,6 +1082,34 @@ void tst_QtJson::toJson() } } +void tst_QtJson::toJsonSillyNumericValues() +{ + QJsonObject object; + QJsonArray array; + array.append(QJsonValue(std::numeric_limits<double>::infinity())); // encode to: null + array.append(QJsonValue(-std::numeric_limits<double>::infinity())); // encode to: null + array.append(QJsonValue(std::numeric_limits<double>::quiet_NaN())); // encode to: null + object.insert("Array", array); + + QByteArray json = QJsonDocument(object).toJson(); + + QByteArray expected = + "{\n" + " \"Array\": [\n" + " null,\n" + " null,\n" + " null\n" + " ]\n" + "}\n"; + + QCOMPARE(json, expected); + + QJsonDocument doc; + doc.setObject(object); + json = doc.toJson(); + QCOMPARE(json, expected); +} + void tst_QtJson::fromJson() { { |