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

Havardpe/avoid reading past json value in slime json parser

3 files changed, 5 insertions, 5 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 97a96c4bac6..aff27959ec9 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -443,12 +443,12 @@ Test::assertSlime(const std::string &exp, const DocsumReply &reply, uint32_t id,
         vespalib::slime::JsonFormat::encode(slime, buf, false);
         vespalib::Slime tmpSlime;
         size_t used = vespalib::slime::JsonFormat::decode(buf.get(), tmpSlime);
-        EXPECT_EQUAL(buf.get().size, used);
+        EXPECT_TRUE(used > 0);
         slime = std::move(tmpSlime);
     }
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(exp, expSlime);
-    EXPECT_EQUAL(exp.size(), used);
+    EXPECT_TRUE(used > 0);
     return EXPECT_EQUAL(expSlime, slime);
 }
 
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 17759e353e7..2d0ff39efa4 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -119,7 +119,7 @@ FieldBlock::FieldBlock(const vespalib::string &jsonInput)
     : input(jsonInput), slime(), binary(1024), json()
 {
     size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-    EXPECT_EQUAL(jsonInput.size(), used);
+    EXPECT_TRUE(used > 0);
     {
         search::SlimeOutputRawBufAdapter adapter(binary);
         vespalib::slime::JsonFormat::encode(slime, adapter, true);
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index 355151dd88c..db707e4aa97 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -213,12 +213,12 @@ verify(vespalib::stringref exp, const Slime &slime) {
     Memory expMemory(exp);
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(expMemory, expSlime);
-    EXPECT_EQUAL(used, expMemory.size);
+    EXPECT_TRUE(used > 0);
     vespalib::SimpleBuffer output;
     vespalib::slime::JsonFormat::encode(slime, output, true);
     Slime reSlimed;
     used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed);
-    EXPECT_EQUAL(used, output.get().size);
+    EXPECT_TRUE(used > 0);
     EXPECT_EQUAL(expSlime, reSlimed);
 }