mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-05 13:14:11 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix MG_EOO

Browse Source
This commit is contained in:
Sergio R. Caprile 2022-07-22 11:50:23 -03:00
parent d1828ecdb4
commit 1eed80375d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mongoose.c
View File

@ -2496,7 +2496,7 @@ int mg_json_get(const char *s, int len, const char *path, int *toklen) {
// Ditto for `{` and `}`. Hence +2 in the code below. // Ditto for `{` and `}`. Hence +2 in the code below.
#define MG_EOO(x) \ #define MG_EOO(x) \
do { \ do { \
if (depth == ed && ci != ei) return MG_JSON_NOT_FOUND; \ if (depth == ed && (ci != ei || ci < 0)) return MG_JSON_NOT_FOUND; \
if (c != nesting[depth - 1] + 2) return MG_JSON_INVALID; \ if (c != nesting[depth - 1] + 2) return MG_JSON_INVALID; \
depth--; \ depth--; \
MG_CHECKRET(x); \ MG_CHECKRET(x); \

2
src/json.c
View File

@ -60,7 +60,7 @@ int mg_json_get(const char *s, int len, const char *path, int *toklen) {
// Ditto for `{` and `}`. Hence +2 in the code below. // Ditto for `{` and `}`. Hence +2 in the code below.
#define MG_EOO(x) \ #define MG_EOO(x) \
do { \ do { \
if (depth == ed && ci != ei) return MG_JSON_NOT_FOUND; \ if (depth == ed && (ci != ei || ci < 0)) return MG_JSON_NOT_FOUND; \
if (c != nesting[depth - 1] + 2) return MG_JSON_INVALID; \ if (c != nesting[depth - 1] + 2) return MG_JSON_INVALID; \
depth--; \ depth--; \
MG_CHECKRET(x); \ MG_CHECKRET(x); \

2
test/unit_test.c
View File

@ -2317,7 +2317,7 @@ static void test_get_header_var(void) {
static void test_json(void) { static void test_json(void) {
const char *s; const char *s;
const char *s1 = "{\"a\":{},\"b\":7,\"c\":[[],2]}"; const char *s1 = "{\"a\":{},\"b\":7,\"c\":[[],2]}";
const char *s2 = "{\"a\":{\"b1\":{}},\"c\":7}"; const char *s2 = "{\"a\":{\"b1\":{}},\"c\":7,\"d\":{\"b2\":{}}}";
int n, n1 = (int) strlen(s1), n2 = (int) strlen(s2); int n, n1 = (int) strlen(s1), n2 = (int) strlen(s2);
ASSERT(mg_json_get(" true ", 6, "", &n) == MG_JSON_INVALID); ASSERT(mg_json_get(" true ", 6, "", &n) == MG_JSON_INVALID);