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

Correct condition check sequence for the prev fix

Browse Source
This commit is contained in:
cpq 2022-08-29 13:01:56 +01:00
parent 0661f5921a
commit 7f30c01c58
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mongoose.c
View File

@ -2563,13 +2563,14 @@ int mg_json_get(struct mg_str json, const char *path, int *toklen) {
case S_KEY:
if (c == '"') {
int n = mg_pass_string(&s[i + 1], len - i - 1);
printf("K %s %d %d %d [%.*s]\n", path, pos, n, i, n + 2, s + i);
if (n < 0) return n;
if (i + 1 + n >= len) return MG_JSON_NOT_FOUND;
// printf("K[%.*s] %d %d %d\n", n, &s[i + 1], n, depth, ed);
printf("K %s [%.*s] %d %d %d\n", path, n, &s[i + 1], n, depth, ed);
if (depth == ed && path[pos - 1] == '.' &&
strncmp(&s[i + 1], &path[pos], (size_t) n) == 0 &&
(path[pos + n] == '\0' || path[pos + n] == '.' ||
path[pos + n] == '[') &&
strncmp(&s[i + 1], &path[pos], (size_t) n) == 0) {
path[pos + n] == '[')) {
pos += n;
}
i += n + 1;

7
src/json.c
View File

@ -167,13 +167,14 @@ int mg_json_get(struct mg_str json, const char *path, int *toklen) {
case S_KEY:
if (c == '"') {
int n = mg_pass_string(&s[i + 1], len - i - 1);
printf("K %s %d %d %d [%.*s]\n", path, pos, n, i, n + 2, s + i);
if (n < 0) return n;
if (i + 1 + n >= len) return MG_JSON_NOT_FOUND;
// printf("K[%.*s] %d %d %d\n", n, &s[i + 1], n, depth, ed);
printf("K %s [%.*s] %d %d %d\n", path, n, &s[i + 1], n, depth, ed);
if (depth == ed && path[pos - 1] == '.' &&
strncmp(&s[i + 1], &path[pos], (size_t) n) == 0 &&
(path[pos + n] == '\0' || path[pos + n] == '.' ||
path[pos + n] == '[') &&
strncmp(&s[i + 1], &path[pos], (size_t) n) == 0) {
path[pos + n] == '[')) {
pos += n;
}
i += n + 1;