- Check if return value of strtok_r is null
Change-Id: I0eae2665d227ac730fed7de3f7b49c0255224c19
break;
key = strdup(token);
token = strtok_r(NULL, ",\"", &saveptr);
- if (*token != ':') {
+ if (!token || *token != ':') {
_E("Invalid json format");
free(key);
return -1;
}
+
if (strlen(token) == 1) {
token = strtok_r(NULL, "\"", &saveptr);
- if (*token == ',' || *token == '}')
+ if (!token) {
+ _E("Invalid json format");
+ free(key);
+ return -1;
+ }
+ else if (*token == ',' || *token == '}')
*token = 0;
} else {
token++;