From 31bfc8223e0eefcb69ac2e6c565bc8a7ddfbdb84 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Wed, 28 Aug 2013 12:48:29 +0200 Subject: [PATCH] Made toPrettyString slightly smarter and always output valid JSON, no matter what. (May still output altered contents, though.) --- lib/json.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/json.cpp b/lib/json.cpp index 2b78934b..928c410b 100644 --- a/lib/json.cpp +++ b/lib/json.cpp @@ -674,9 +674,9 @@ std::string JSON::Value::toPrettyString(int indentation) const{ break; } case STRING: { - for (unsigned int i = 0; i < 5 && i < strVal.size(); ++i){ - if (strVal[i] < 32 || strVal[i] > 125){ - return JSON::Value((long long int)strVal.size()).asString() + " bytes of binary data"; + for (unsigned int i = 0; i < 201 && i < strVal.size(); ++i){ + if (strVal[i] < 32 || strVal[i] > 126 || strVal.size() > 200){ + return "\""+JSON::Value((long long int)strVal.size()).asString() + " bytes of data\""; } } return string_escape(strVal);