Fix parsing incomplete unicode escape "\uaaa"

ruby · Jan 20, 2025 · 86c0d4e · 86c0d4e
1 parent f8817fe
commit 86c0d4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
@@ -630,7 +630,7 @@ static VALUE json_string_unescape(JSON_ParserState *state, const char *string, c
                 unescape = (char *) "\f";
                 break;
             case 'u':
-                if (pe > stringEnd - 4) {
+                if (pe > stringEnd - 5) {
                   raise_parse_error("incomplete unicode character escape sequence at '%s'", p);
                 } else {
                     uint32_t ch = unescape_unicode((unsigned char *) ++pe);

diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
@@ -302,6 +302,14 @@ def test_parse_broken_string
     end
   end
 
+  def test_invalid_unicode_escape
+    assert_raise(JSON::ParserError) { parse('"\u"') }
+    assert_raise(JSON::ParserError) { parse('"\ua"') }
+    assert_raise(JSON::ParserError) { parse('"\uaa"') }
+    assert_raise(JSON::ParserError) { parse('"\uaaa"') }
+    assert_equal "\uaaaa", parse('"\uaaaa"')
+  end
+
   def test_parse_big_integers
     json1 = JSON(orig = (1 << 31) - 1)
     assert_equal orig, parse(json1)