Merge pull request #3621 from vespa-engine/revert-3612-revert-3587-havardpe/avoid-reading-past-json-value-in-slime-json-parser

Revert "Revert "Havardpe/avoid reading past json value in slime json parser""

2 files changed, 4 insertions, 4 deletions

diff --git a/storage/src/tests/common/hostreporter/util.cpp b/storage/src/tests/common/hostreporter/util.cpp
index a9578e8d8cf..e0563a431e6 100644
--- a/storage/src/tests/common/hostreporter/util.cpp
+++ b/storage/src/tests/common/hostreporter/util.cpp
@@ -24,10 +24,10 @@ reporterToSlime(HostReporter &hostReporter, vespalib::Slime &slime) {
     hostReporter.report(stream);
     stream << End();
     std::string jsonData = json.str();
-    size_t parsedSize = JsonFormat::decode(Memory(jsonData), slime);
+    size_t parsed = JsonFormat::decode(Memory(jsonData), slime);
 
-    if (jsonData.size() != parsedSize) {
-        CPPUNIT_FAIL("Sizes of jsonData mismatched, probably not json:\n" + jsonData);
+    if (parsed == 0) {
+        CPPUNIT_FAIL("jsonData is not json:\n" + jsonData);
     }
 }
 }
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 8622f241a18..3a71444e74c 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -130,7 +130,7 @@ vespalib::Slime slime; \
     size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime); \
     vespalib::SimpleBuffer buffer;                                      \
     JsonFormat::encode(slime, buffer, false); \
-    if (jsonData.size() != parsed) { \
+    if (parsed == 0) { \
         std::ostringstream error; \
         error << "Failed to parse JSON: '\n" \
               << jsonData << "'\n:" << buffer.get().make_string() << "\n"; \