diff options
author | Jean Boussier <[email protected]> | 2025-01-20 08:34:40 +0100 |
---|---|---|
committer | Jean Boussier <[email protected]> | 2025-01-20 10:31:56 +0100 |
commit | 33708f2dc4f8327aa70fe10a53423b13da85e69e () | |
tree | dbdca13fbfcaecf8ae8bffaa98bcdff8df1f7372 | |
parent | 4404688a0e9e606aea870d79f5e8be6ac1524335 (diff) |
[ruby/json] Fix a regression in the parser with leading /
Ref: https://.com/ruby/ruby/pull/12598 This could lead to an infinite loop. https://.com/ruby/json/commit/f8cfa2696a
Notes: Merged: https://.com/ruby/ruby/pull/12600
-rw-r--r-- | ext/json/parser/parser.c | 9 | ||||
-rw-r--r-- | test/json/json_parser_test.rb | 7 |
2 files changed, 13 insertions, 3 deletions
@@ -476,7 +476,7 @@ static const bool whitespace[256] = { ['/'] = 1, }; -static void json_eat_comments(JSON_ParserState *state) { if (state->cursor + 1 < state->end) { @@ -508,9 +508,10 @@ json_eat_comments(JSON_ParserState *state) break; } default: - return; } } } static inline void @@ -520,7 +521,9 @@ json_eat_whitespace(JSON_ParserState *state) if (RB_LIKELY(*state->cursor != '/')) { state->cursor++; } else { - json_eat_comments(state); } } } @@ -629,6 +629,13 @@ class JSONParserTest < Test::Unit::TestCase end end private def string_deduplication_available? |