From fd8e524b823629b700ae550faced472757df3fbb Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 25 Mar 2020 19:14:15 +0300 Subject: [PATCH] Configuration: fixed comments parsing. Unclosed multi-line comments and "/" at the end of JSON shouldn't be allowed. --- src/nxt_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/nxt_conf.c b/src/nxt_conf.c index 2a952c35..3e1130be 100644 --- a/src/nxt_conf.c +++ b/src/nxt_conf.c @@ -1269,6 +1269,7 @@ nxt_conf_json_skip_space(u_char *start, u_char *end) case '\r': continue; case '/': + start = p; state = sw_after_slash; continue; } @@ -1285,7 +1286,6 @@ nxt_conf_json_skip_space(u_char *start, u_char *end) continue; } - p--; break; case sw_single_comment: @@ -1318,6 +1318,10 @@ nxt_conf_json_skip_space(u_char *start, u_char *end) break; } + if (nxt_slow_path(state != sw_normal)) { + return start; + } + return p; }