From 5b4f1baef055d2a7be58cdfe7329b1b2f5b748c9 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Tue, 30 Jun 2020 01:10:49 -0400 Subject: [PATCH] Fix pure parser with unclosed arrays / objects [Fix #314] --- lib/json/pure/parser.rb | 8 ++++++-- tests/fixtures/fail29.json | 1 + tests/fixtures/fail30.json | 1 + tests/fixtures/fail31.json | 1 + tests/fixtures/fail32.json | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tests/fixtures/fail29.json create mode 100644 tests/fixtures/fail30.json create mode 100644 tests/fixtures/fail31.json create mode 100644 tests/fixtures/fail32.json diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb index 1c8f59f8..2bf93f09 100644 --- a/lib/json/pure/parser.rb +++ b/lib/json/pure/parser.rb @@ -242,8 +242,10 @@ def parse_array @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 @@ def parse_object @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 00000000..98232c64 --- /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 00000000..558ed37d --- /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 00000000..70773e47 --- /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 00000000..b18d550c --- /dev/null +++ b/tests/fixtures/fail32.json @@ -0,0 +1 @@ +{"foo": "bar"