From ccb97fc6e0f988159109ad422620d13dba48983c Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 14 Jul 2014 15:52:26 +0200 Subject: [PATCH] Fixed bug JsonObjectBase::getNestedTokenCount() that reads uninitialized token --- JsonParser/JsonObjectBase.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/JsonParser/JsonObjectBase.cpp b/JsonParser/JsonObjectBase.cpp index c86ff069..60d47ee8 100644 --- a/JsonParser/JsonObjectBase.cpp +++ b/JsonParser/JsonObjectBase.cpp @@ -10,15 +10,15 @@ using namespace ArduinoJson::Parser; int JsonObjectBase::getNestedTokenCount(jsmntok_t* token) { - int end = token->end; - int count = 0; + int tokensToVisit = token->size; + int count = 0; - token++; - - while (token->start < end) + while (tokensToVisit) { - token++; count++; + token++; + tokensToVisit--; + tokensToVisit += token->size; } return count;