summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2017-09-28 15:26:40 +0000
committerHåvard Pettersen <havardpe@oath.com>2017-09-29 10:16:46 +0000
commitabefb37a660e395342a1460e233a0933d2e10dc9 (patch)
tree8f7bbea42745102db5269a89e6efdbce117fc603 /config
parent88a6576a3cf7b15b2bf9a4cd3bcc861e3a4f38c0 (diff)
avoid requiring that json parsing consumes all input
(the input could end with \n if human readable)
Diffstat (limited to 'config')
-rw-r--r--config/src/vespa/config/frt/frtconfigresponsev3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/src/vespa/config/frt/frtconfigresponsev3.cpp b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
index 3791d3c55b7..cad84879711 100644
--- a/config/src/vespa/config/frt/frtconfigresponsev3.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
@@ -59,7 +59,7 @@ FRTConfigResponseV3::readConfigValue() const
SlimePtr payloadData(rawData);
DecompressedData data(decompress(((*_returnValues)[1]._data._buf), ((*_returnValues)[1]._data._len), info.compressionType, info.uncompressedSize));
size_t consumedSize = JsonFormat::decode(data.memRef, *rawData);
- if (consumedSize != data.size) {
+ if (consumedSize == 0) {
std::string json(make_json(*payloadData, true));
LOG(error, "Error decoding JSON. Consumed size: %lu, uncompressed size: %u, compression type: %s, assumed uncompressed size(%u), compressed size: %u, slime(%s)", consumedSize, data.size, compressionTypeToString(info.compressionType).c_str(), info.uncompressedSize, ((*_returnValues)[1]._data._len), json.c_str());
assert(false);