bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-17 20:42:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added a verification of the token type before converting to string

Browse Source
This commit is contained in:
Benoit Blanchon
2014-01-11 16:53:20 +01:00
parent 4713e90f12
commit 1475066edd
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
JsonArray.cpp
View File

@ -24,7 +24,7 @@ jsmntok_t* JsonArray::getToken(int index)
return 0;
// skip first token, it's the whole object
int currentToken = 1;
jsmntok_t* currentToken = tokens + 1;
// skip all tokens before the specified index
for (int i = 0; i < index; i++)
@ -33,7 +33,7 @@ jsmntok_t* JsonArray::getToken(int index)
currentToken += 1 + getNestedTokenCount(currentToken);
}
return &tokens[currentToken];
return currentToken;
}
JsonArray JsonArray::getArray(int index)
@ -48,6 +48,5 @@ JsonHashTable JsonArray::getHashTable(int index)
char* JsonArray::getString(int index)
{
jsmntok_t* token = getToken(index);
return token != 0 ? json + token->start : 0;
return getTokenString(getToken(index));
}