feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed bugs in when token is not found

Browse Source
This commit is contained in:
Benoit Blanchon
2014-01-15 13:47:06 +01:00
parent 0ae9a420bb
commit 38249f5c21
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
JsonObjectBase.cpp
View File

@ -39,21 +39,21 @@ bool JsonObjectBase::getBoolFromToken(jsmntok_t* token)
double JsonObjectBase::getDoubleFromToken(jsmntok_t* token) double JsonObjectBase::getDoubleFromToken(jsmntok_t* token)
{ {
if (token->type != JSMN_PRIMITIVE) return 0; if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
return strtod(json + token->start, 0); return strtod(json + token->start, 0);
} }
long JsonObjectBase::getLongFromToken(jsmntok_t* token) long JsonObjectBase::getLongFromToken(jsmntok_t* token)
{ {
if (token->type != JSMN_PRIMITIVE) return 0; if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
return strtol(json + token->start, 0, 0); return strtol(json + token->start, 0, 0);
} }
char* JsonObjectBase::getStringFromToken(jsmntok_t* token) char* JsonObjectBase::getStringFromToken(jsmntok_t* token)
{ {
if (token->type != JSMN_PRIMITIVE && token->type != JSMN_STRING) if (token == 0 || token->type != JSMN_PRIMITIVE && token->type != JSMN_STRING)
return 0; return 0;
// add null terminator to the string // add null terminator to the string