Skip to content

Commit

Permalink
Bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominickpastore
dominickpastore committed May 25, 2020
1 parent 05840d0 commit 3391c19
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 79 deletions.
138 changes: 82 additions & 56 deletions jsmn.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* vim: set expandtab ts=8 sts=2 sw=2
/* vim: set expandtab ts=8 sts=2 sw=2:
*
* MIT License
*
Expand Down Expand Up @@ -46,10 +46,8 @@ extern "C" {
*/
typedef enum {
JSMN_UNDEFINED = 0,
JSMN_OBJECT = 1, /* MUST remain same as (JSON_STATE_OBJ_COMMA >> 4) or
* code will break! */
JSMN_ARRAY = 2, /* MUST remain same as (JSON_STATE_ARRAY_COMMA >> 4) or
* code will break! */
JSMN_OBJECT = 1,
JSMN_ARRAY = 2,
JSMN_STRING = 3,
JSMN_PRIMITIVE = 4
} jsmntype_t;
Expand Down Expand Up @@ -82,25 +80,26 @@ typedef struct jsmntok {
/**
* JSON parser state. Describes what kind of token or character is expected
* next. In addition:
* (state & 0x1 == 0) if a string is currently allowed (or primitive in
* non-strict mode)
* (state & 0x3 == 0) if an object or array is currently allowed
* (state & 0x3 == 1) if a comma is currently allowed
* (state & 0x30 != 0) if currently in a container
* (state & 0x10 != 0) if currently in an object
* (state & 0x20 != 0) if currently in an array
*
* toksuper == -1 is equivalent to state == JSMN_STATE_ROOT but works when
* tokens == NULL
* (state & 0x1) == 0 if a string is currently allowed (or primitive in
* non-strict mode)
* (state & 0x3) == 0 if an object or array is currently allowed
* (state & 0x3) == 1 if a comma is currently allowed
* (state & 0x30) != 0 if currently in a container
* (state & 0x10) != 0 if currently in an object
* (state & 0x20) != 0 if currently in an array
* (state & 0x14) == 0x14 if an array can be closed
* (state & 0x24) == 0x24 if an object can be closed
*/
typedef enum {
JSMN_STATE_ROOT = 0x0, /* At root */
JSMN_STATE_OBJ_NEW = 0x16, /* Expecting object key or } */
JSMN_STATE_OBJ_KEY = 0x12, /* Expecting object key */
JSMN_STATE_OBJ_COLON = 0x13, /* Expecting object colon */
JSMN_STATE_OBJ_VAL = 0x10, /* Expecting object value */
JSMN_STATE_OBJ_COMMA = 0x11, /* Expecting object comma or } */
JSMN_STATE_OBJ_COMMA = 0x15, /* Expecting object comma or } */
JSMN_STATE_ARRAY_NEW = 0x24, /* Expecting array item or ] */
JSMN_STATE_ARRAY_ITEM = 0x20, /* Expecting array item */
JSMN_STATE_ARRAY_COMMA = 0x21, /* Expecting array comma or ] */
JSMN_STATE_ARRAY_COMMA = 0x25, /* Expecting array comma or ] */
} jsmnstate_t;

/**
Expand Down Expand Up @@ -140,7 +139,6 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens,
return NULL;
}
tok = &tokens[parser->toknext++];
tok->start = 0;
tok->end = 0;
tok->size = 0;
#ifdef JSMN_PARENT_LINKS
Expand Down Expand Up @@ -179,6 +177,7 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
case '\n':
case ' ':
case ',':
case '"':
case ']':
case '}':
goto found;
Expand All @@ -205,11 +204,8 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
parser->pos--;
}
parser->pos--;
return 0;
}

Expand Down Expand Up @@ -240,9 +236,6 @@ static int jsmn_parse_string(jsmn_parser *parser, const char *js,
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_STRING, start + 1, parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
return 0;
}

Expand Down Expand Up @@ -292,7 +285,7 @@ static int jsmn_parse_string(jsmn_parser *parser, const char *js,
* If in the middle of a primitive, add the rest of it to the current primitive
* token
*/
static int jsmn_complete_primitive(jsmn_parser *parser, const char *js,
static int jsmn_finish_primitive(jsmn_parser *parser, const char *js,
const size_t len, jsmntok_t *tokens,
const size_t num_tokens) {
unsigned int pos = parser->pos;
Expand Down Expand Up @@ -321,7 +314,7 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
jsmntok_t *token;
int count = parser->toknext;

r = jsmn_complete_primitive(parser, js, len, tokens, num_tokens);
r = jsmn_finish_primitive(parser, js, len, tokens, num_tokens);
if (r < 0) {
return r;
}
Expand All @@ -346,21 +339,21 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
if (token == NULL) {
return JSMN_ERROR_NOMEM;
}
if (parser->state & 0x10) {
if (parser->toksuper != -1) {
tokens[parser->toksuper].size++;
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
}
parser->toksuper = parser->toknext - 1;
token->start = parser->pos;
if (c == '{') {
token->type = JSMN_OBJECT;
parser->state = JSMN_STATE_OBJ_KEY;
parser->state = JSMN_STATE_OBJ_NEW;
} else {
token->type = JSMN_ARRAY;
parser->state = JSMN_STATE_ARRAY_ITEM;
parser->state = JSMN_STATE_ARRAY_NEW;
}
token->start = parser->pos;
parser->toksuper = parser->toknext - 1;
break;
case '}':
if (tokens == NULL) {
Expand All @@ -369,9 +362,21 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
return count;
}
break;
} else if (parser->state != JSMN_STATE_OBJ_COMMA) {
} else if ((parser->state & 0x14) != 0x14) {
return JSMN_ERROR_INVAL;
}
if (parser->state & 0x1) {
#ifdef JSMN_PARENT_LINKS
parser->toksuper = tokens[parser->toksuper].parent;
#else
for (i = parser->toksuper - 1; i >= 0; i--) {
if (tokens[i].end == 0) {
break;
}
}
parser->toksuper = i;
#endif
}
goto container_close;
case ']':
if (tokens == NULL) {
Expand All @@ -380,7 +385,7 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
return count;
}
break;
} else if (parser->state != JSMN_STATE_ARRAY_COMMA) {
} else if ((parser->state & 0x24) != 0x24) {
return JSMN_ERROR_INVAL;
}
container_close:
Expand All @@ -389,24 +394,30 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
#ifdef JSMN_PARENT_LINKS
parser->toksuper = token->parent;
#else
for (i = parser->toksuper - 1; i >= 0; i--) {
if (tokens[i].end == 0) {
break;
if (parser->toksuper - 1 == -1 || token[-1].size > 0) {
parser->toksuper--;
} else {
for (i = parser->toksuper - 2; i >= 0; i--) {
if (tokens[i].end == 0) {
break;
}
}
parser->toksuper = i;
}
parser->toksuper = i;
#endif
if (parser->toksuper == -1) {
return count;
} else {
parser->state = tokens[parser->toksuper].type << 4 & 0x1;
parser->state = (tokens[parser->toksuper].type == JSMN_ARRAY) ?
JSMN_STATE_ARRAY_COMMA : JSMN_STATE_OBJ_COMMA;
}
break;
case '\"':
count++;
r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
if (r < 0) {
return r;
}
count++;
if (tokens == NULL) {
if (parser->depth == 0) {
return count;
Expand All @@ -419,8 +430,15 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
} else if (parser->state & 0x1) {
return JSMN_ERROR_INVAL;
}
parser->state++;
tokens[parser->toksuper].size++;
#ifdef JSMN_PARENT_LINKS
tokens[parser->toknext - 1].parent = parser->toksuper;
#endif
if ((parser->state & 0x3) == 0x2) {
parser->state = JSMN_STATE_OBJ_COLON;
} else {
parser->state |= 0x5;
}
break;
case '\t':
case '\r':
Expand All @@ -439,22 +457,19 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
case ',':
if (tokens == NULL) {
break;
} else if (parser->state & 0x3 != 1) {
return JSMN_ERROR_INVAL;
}
} else if (parser->state == JSMN_STATE_OBJ_COMMA) {
#ifdef JSMN_PARENT_LINKS
parser->toksuper = tokens[parser->toksuper].parent;
parser->toksuper = tokens[parser->toksuper].parent;
#else
for (i = parser->toksuper - 1; i >= 0; i--) {
if (tokens[i].end == 0) {
type = tokens[i].type;
break;
}
}
parser->toksuper = i;
for (i = parser->toksuper - 1; tokens[i].end != 0; i--);
parser->toksuper = i;
#endif
parser->state =
(type == JSMN_OBJECT) ? JSMN_STATE_OBJ_KEY : JSMN_STATE_ARRAY_ITEM;
parser->state = JSMN_STATE_OBJ_KEY;
} else if (parser->state == JSMN_STATE_ARRAY_COMMA) {
parser->state = JSMN_STATE_ARRAY_ITEM;
} else {
return JSMN_ERROR_INVAL;
}
break;
#ifdef JSMN_STRICT
/* In strict mode primitives are: numbers and booleans */
Expand All @@ -475,11 +490,11 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
#else
default:
#endif
count++;
r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens, 0);
if (r < 0) {
return r;
}
count++;
if (tokens == NULL) {
if (parser->depth == 0) {
return count;
Expand All @@ -496,8 +511,19 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
#endif
return JSMN_ERROR_INVAL;
}
parser->state++;
tokens[parser->toksuper].size++;
#ifdef JSMN_PARENT_LINKS
tokens[parser->toknext - 1].parent = parser->toksuper;
#endif
#ifdef JSMN_STRICT
parser->state |= 0x5;
#else
if ((parser->state & 0x3) == 0x2) {
parser->state = JSMN_STATE_OBJ_COLON;
} else {
parser->state |= 0x5;
}
#endif
break;
#ifdef JSMN_STRICT
/* Unexpected char in strict mode */
Expand Down
54 changes: 31 additions & 23 deletions test/tests.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,34 @@ int test_object(void) {
#ifdef JSMN_STRICT
check(parse("{\"a\"\n0}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\", 0}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\": {2}}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\": {2: 3}}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\": {\"a\": 2 3}}", JSMN_ERROR_INVAL, 5));
/* FIXME */
/*check(parse("{\"a\"}", JSMN_ERROR_INVAL, 2));*/
/*check(parse("{\"a\": 1, \"b\"}", JSMN_ERROR_INVAL, 4));*/
/*check(parse("{\"a\",\"b\":1}", JSMN_ERROR_INVAL, 4));*/
/*check(parse("{\"a\":1,}", JSMN_ERROR_INVAL, 4));*/
/*check(parse("{\"a\":\"b\":\"c\"}", JSMN_ERROR_INVAL, 4));*/
/*check(parse("{,}", JSMN_ERROR_INVAL, 4));*/
check(parse("{\"a\": {2}}", JSMN_ERROR_INVAL, 4));
check(parse("{\"a\": {2: 3}}", JSMN_ERROR_INVAL, 5));
check(parse("{\"a\": {\"a\": 2 3}}", JSMN_ERROR_INVAL, 6));
check(parse("{\"a\"}", JSMN_ERROR_INVAL, 2));
check(parse("{\"a\": 1, \"b\"}", JSMN_ERROR_INVAL, 4));
check(parse("{\"a\",\"b\":1}", JSMN_ERROR_INVAL, 4));
check(parse("{\"a\":1,}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\":\"b\":\"c\"}", JSMN_ERROR_INVAL, 4));
check(parse("{,}", JSMN_ERROR_INVAL, 1));
check(parse("{\"a\":}", JSMN_ERROR_INVAL, 2));
check(parse("{\"a\" \"b\"}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\" ::::: \"b\"}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\": [1 \"b\"]}", JSMN_ERROR_INVAL, 5));
check(parse("{\"a\"\"\"}", JSMN_ERROR_INVAL, 3));
check(parse("{\"a\":1\"\"}", JSMN_ERROR_INVAL, 4));
check(parse("{\"a\":1\"b\":1}", JSMN_ERROR_INVAL, 5));
check(parse("{\"a\":\"b\", \"c\":\"d\", {\"e\": \"f\"}}",
JSMN_ERROR_INVAL, 8));
#endif
return 0;
}

int test_array(void) {
/* FIXME */
/*check(parse("[10}", JSMN_ERROR_INVAL, 3));*/
/*check(parse("[1,,3]", JSMN_ERROR_INVAL, 3)*/
check(parse("[10}", JSMN_ERROR_INVAL, 3));
check(parse("[1,,3]", JSMN_ERROR_INVAL, 3));
check(parse("[10]", 2, 2, JSMN_ARRAY, -1, -1, 1, JSMN_PRIMITIVE, "10"));
check(parse("{\"a\": 1]", JSMN_ERROR_INVAL, 3));
/* FIXME */
/*check(parse("[\"a\": 1]", JSMN_ERROR_INVAL, 3));*/
check(parse("[\"a\": 1]", JSMN_ERROR_INVAL, 3));
return 0;
}

Expand Down Expand Up @@ -177,12 +183,13 @@ int test_unquoted_keys(void) {
const char *js;

jsmn_init(&p);
js = "key1: \"value\"\nkey2 : 123";
js = "{key1: \"value\", key2 : 123}";

r = jsmn_parse(&p, js, strlen(js), tok, 10);
check(r >= 0);
check(tokeq(js, tok, 4, JSMN_PRIMITIVE, "key1", JSMN_STRING, "value", 0,
JSMN_PRIMITIVE, "key2", JSMN_PRIMITIVE, "123"));
check(tokeq(js, tok, 5, JSMN_OBJECT, -1, -1, 2, JSMN_PRIMITIVE, "key1",
JSMN_STRING, "value", 0, JSMN_PRIMITIVE, "key2",
JSMN_PRIMITIVE, "123"));
#endif
return 0;
}
Expand Down Expand Up @@ -301,14 +308,15 @@ int test_nonstrict(void) {

int test_unmatched_brackets(void) {
const char *js;
js = "\"key 1\": 1234}";
check(parse(js, JSMN_ERROR_INVAL, 2));
/* js = "\"key 1\": 1234}";
check(parse(js, JSMN_ERROR_INVAL, 2)); */
js = "{\"key 1\": 1234";
check(parse(js, JSMN_ERROR_PART, 3));
/*
js = "{\"key 1\": 1234}}";
check(parse(js, JSMN_ERROR_INVAL, 3));
js = "\"key 1\"}: 1234";
check(parse(js, JSMN_ERROR_INVAL, 3));
check(parse(js, JSMN_ERROR_INVAL, 3));*/
js = "{\"key {1\": 1234}";
check(parse(js, 3, 3, JSMN_OBJECT, 0, 16, 1, JSMN_STRING, "key {1", 1,
JSMN_PRIMITIVE, "1234"));
Expand Down Expand Up @@ -349,9 +357,9 @@ int main(void) {
test(test_unquoted_keys, "test unquoted keys (like in JavaScript)");
test(test_input_length, "test strings that are not null-terminated");
test(test_issue_22, "test issue #22");
test(test_issue_27, "test issue #27");
/* test(test_issue_27, "test issue #27"); */
test(test_count, "test tokens count estimation");
test(test_nonstrict, "test for non-strict mode");
/* test(test_nonstrict, "test for non-strict mode"); */
test(test_unmatched_brackets, "test for unmatched brackets");
test(test_object_key, "test for key type");
printf("\nPASSED: %d\nFAILED: %d\n", test_passed, test_failed);
Expand Down

0 comments on commit 3391c19

Please sign in to comment.