aboutsummaryrefslogtreecommitdiff
path: root/jsmn/jsmn.c
diff options
context:
space:
mode:
Diffstat (limited to 'jsmn/jsmn.c')
-rw-r--r--jsmn/jsmn.c82
1 files changed, 49 insertions, 33 deletions
diff --git a/jsmn/jsmn.c b/jsmn/jsmn.c
index 2de5ec2..2174df9 100644
--- a/jsmn/jsmn.c
+++ b/jsmn/jsmn.c
@@ -1,17 +1,24 @@
#include "jsmn.h"
+/* For json-decode we want strict mode so we don't get
+ * garbage for malformed json
+ */
+#define JSMN_STRICT
+
/**
* Allocates a fresh unused token from the token pool.
*/
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
jsmntok_t *tokens, size_t num_tokens) {
jsmntok_t *tok;
+ parser->count++;
if (parser->toknext >= num_tokens) {
return NULL;
}
tok = &tokens[parser->toknext++];
tok->start = tok->end = -1;
tok->size = 0;
+ tok->line = 0;
#ifdef JSMN_PARENT_LINKS
tok->parent = -1;
#endif
@@ -22,11 +29,12 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
* Fills token type and boundaries.
*/
static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
- int start, int end) {
+ int start, int end, int line) {
token->type = type;
token->start = start;
token->end = end;
token->size = 0;
+ token->line = line;
}
/**
@@ -41,11 +49,13 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
switch (js[parser->pos]) {
+ case '\n' :
+ parser->line++;
+ /* fall-thru */
#ifndef JSMN_STRICT
- /* In strict mode primitive must be followed by "," or "}" or "]" */
case ':':
#endif
- case '\t' : case '\r' : case '\n' : case ' ' :
+ case '\t' : case '\r' : case ' ' :
case ',' : case ']' : case '}' :
goto found;
}
@@ -61,16 +71,16 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
#endif
found:
+ token = jsmn_alloc_token(parser, tokens, num_tokens);
if (tokens == NULL) {
parser->pos--;
return 0;
}
- token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
- jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
+ jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos, parser->line);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
@@ -95,15 +105,15 @@ static int jsmn_parse_string(jsmn_parser *parser, const char *js,
/* Quote: end of string */
if (c == '\"') {
+ token = jsmn_alloc_token(parser, tokens, num_tokens);
if (tokens == NULL) {
return 0;
}
- token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL) {
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
- jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
+ jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos, parser->line);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
@@ -153,7 +163,6 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
int r;
int i;
jsmntok_t *token;
- int count = parser->toknext;
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c;
@@ -162,11 +171,10 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
c = js[parser->pos];
switch (c) {
case '{': case '[':
- count++;
+ token = jsmn_alloc_token(parser, tokens, num_tokens);
if (tokens == NULL) {
break;
}
- token = jsmn_alloc_token(parser, tokens, num_tokens);
if (token == NULL)
return JSMN_ERROR_NOMEM;
if (parser->toksuper != -1) {
@@ -235,11 +243,13 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
case '\"':
r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
- count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
- case '\t' : case '\r' : case '\n' : case ' ':
+ case '\n' :
+ parser->line++;
+ /* fall-thru */
+ case '\t' : case '\r' : case ' ':
break;
case ':':
parser->toksuper = parser->toknext - 1;
@@ -262,35 +272,39 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
#endif
}
break;
+
+ default:
+ /* In non-strict mode every unquoted value is a primitive */
#ifdef JSMN_STRICT
- /* In strict mode primitives are: numbers and booleans */
- case '-': case '0': case '1' : case '2': case '3' : case '4':
- case '5': case '6': case '7' : case '8': case '9':
- case 't': case 'f': case 'n' :
- /* And they must not be keys of the object */
- if (tokens != NULL && parser->toksuper != -1) {
- jsmntok_t *t = &tokens[parser->toksuper];
- if (t->type == JSMN_OBJECT ||
- (t->type == JSMN_STRING && t->size != 0)) {
+ switch (c) {
+ /* In strict mode primitives are: numbers and booleans */
+ case '-': case '0': case '1' : case '2': case '3' : case '4':
+ case '5': case '6': case '7' : case '8': case '9':
+ case 't': case 'f': case 'n' :
+#ifndef JSMN_FULLY_STRICT
+ /* Allow Inf and NaN in any mode other than fully strict */
+ case 'I': case 'N':
+#endif
+ /* And they must not be keys of the object */
+ if (tokens != NULL && parser->toksuper != -1) {
+ jsmntok_t *t = &tokens[parser->toksuper];
+ if (t->type == JSMN_OBJECT ||
+ (t->type == JSMN_STRING && t->size != 0)) {
+ return JSMN_ERROR_INVAL;
+ }
+ }
+ break;
+
+ default:
+ /* Unexpected char in strict mode */
return JSMN_ERROR_INVAL;
- }
}
-#else
- /* In non-strict mode every unquoted value is a primitive */
- default:
#endif
r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
if (r < 0) return r;
- count++;
if (parser->toksuper != -1 && tokens != NULL)
tokens[parser->toksuper].size++;
break;
-
-#ifdef JSMN_STRICT
- /* Unexpected char in strict mode */
- default:
- return JSMN_ERROR_INVAL;
-#endif
}
}
@@ -303,7 +317,7 @@ int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
}
}
- return count;
+ return parser->count;
}
/**
@@ -314,5 +328,7 @@ void jsmn_init(jsmn_parser *parser) {
parser->pos = 0;
parser->toknext = 0;
parser->toksuper = -1;
+ parser->count = 0;
+ parser->line = 1;
}
generated by cgit v1.1 at 2025-07-12 07:24:23 +0000