diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-08-14 14:03:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-14 14:03:43 +0900 |
| commit | 09b0bcb93bb0eb4b7c8c84eb5a7bb8fa98545ba9 (patch) | |
| tree | 31d1e4ff79508ec209dc8612bae5e7058698de86 | |
| parent | 03f1699ec4127bf4d8282dbe90c683a5716413a3 (diff) | |
| parent | 5b4f1baef055d2a7be58cdfe7329b1b2f5b748c9 (diff) | |
| download | json-09b0bcb93bb0eb4b7c8c84eb5a7bb8fa98545ba9.tar.gz | |
Merge pull request #425 from marcandre/fix_pure_parser
Fix pure parser with unclosed arrays / objects [Fix #314]
| -rw-r--r-- | lib/json/pure/parser.rb | 8 | ||||
| -rw-r--r-- | tests/fixtures/fail29.json | 1 | ||||
| -rw-r--r-- | tests/fixtures/fail30.json | 1 | ||||
| -rw-r--r-- | tests/fixtures/fail31.json | 1 | ||||
| -rw-r--r-- | tests/fixtures/fail32.json | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb index 5db244c..6f37e0c 100644 --- a/lib/json/pure/parser.rb +++ b/lib/json/pure/parser.rb @@ -242,8 +242,10 @@ module JSON @max_nesting.nonzero? && @current_nesting > @max_nesting result = @array_class.new delim = false - until eos? + loop do case + when eos? + raise ParserError, "unexpected end of string while parsing array" when !UNPARSED.equal?(value = parse_value) delim = false result << value @@ -274,8 +276,10 @@ module JSON @max_nesting.nonzero? && @current_nesting > @max_nesting result = @object_class.new delim = false - until eos? + loop do case + when eos? + raise ParserError, "unexpected end of string while parsing object" when !UNPARSED.equal?(string = parse_string) skip(IGNORE) unless scan(PAIR_DELIMITER) diff --git a/tests/fixtures/fail29.json b/tests/fixtures/fail29.json new file mode 100644 index 0000000..98232c6 --- /dev/null +++ b/tests/fixtures/fail29.json @@ -0,0 +1 @@ +{ diff --git a/tests/fixtures/fail30.json b/tests/fixtures/fail30.json new file mode 100644 index 0000000..558ed37 --- /dev/null +++ b/tests/fixtures/fail30.json @@ -0,0 +1 @@ +[ diff --git a/tests/fixtures/fail31.json b/tests/fixtures/fail31.json new file mode 100644 index 0000000..70773e4 --- /dev/null +++ b/tests/fixtures/fail31.json @@ -0,0 +1 @@ +[1, 2, 3, diff --git a/tests/fixtures/fail32.json b/tests/fixtures/fail32.json new file mode 100644 index 0000000..b18d550 --- /dev/null +++ b/tests/fixtures/fail32.json @@ -0,0 +1 @@ +{"foo": "bar" |