Fix EOF issue in Oj::Parser

ohler55 · Jun 8, 2024 · 036be24 · 036be24
1 parent 2d2109b
commit 036be24
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.16.4 - unreleased
+
+- Fixed Oj::Parse EOF issue on larger stream input.
+
 ## 3.16.3 - 2023-12-11
 
 - Fixed the gemspec to allow earlier versions of the bigdecimal gem.

diff --git a/ext/oj/oj.c b/ext/oj/oj.c
@@ -36,6 +36,7 @@ ID oj_as_json_id;
 ID oj_begin_id;
 ID oj_bigdecimal_id;
 ID oj_end_id;
+ID oj_eofq_id;
 ID oj_exclude_end_id;
 ID oj_error_id;
 ID oj_file_id;
@@ -1849,6 +1850,7 @@ void Init_oj(void) {
     oj_begin_id        = rb_intern("begin");
     oj_bigdecimal_id   = rb_intern("BigDecimal");
     oj_end_id          = rb_intern("end");
+    oj_eofq_id         = rb_intern("eof?");
     oj_error_id        = rb_intern("error");
     oj_exclude_end_id  = rb_intern("exclude_end?");
     oj_file_id         = rb_intern("file?");

diff --git a/ext/oj/oj.h b/ext/oj/oj.h
@@ -334,6 +334,7 @@ extern ID oj_as_json_id;
 extern ID oj_begin_id;
 extern ID oj_bigdecimal_id;
 extern ID oj_end_id;
+extern ID oj_eofq_id;
 extern ID oj_error_id;
 extern ID oj_exclude_end_id;
 extern ID oj_file_id;

diff --git a/ext/oj/parser.c b/ext/oj/parser.c
@@ -1114,9 +1114,6 @@ static void parse(ojParser p, const byte *json) {
             p->map = trail_map;
         }
     }
-    if (0 < p->depth) {
-        parse_error(p, "parse error, not closed");
-    }
     if (0 == p->depth) {
         switch (p->map[256]) {
         case '0':
@@ -1390,10 +1387,16 @@ static VALUE load(VALUE self) {
 
     p->start(p);
     while (true) {
-        rb_funcall(p->reader, oj_readpartial_id, 2, INT2NUM(16385), rbuf);
+	rb_funcall(p->reader, oj_readpartial_id, 2, INT2NUM(16385), rbuf);
         if (0 < RSTRING_LEN(rbuf)) {
             parse(p, (byte *)StringValuePtr(rbuf));
         }
+	if (Qtrue == rb_funcall(p->reader, oj_eofq_id, 0)) {
+	    if (0 < p->depth) {
+		parse_error(p, "parse error, not closed");
+	    }
+	    break;
+	}
     }
     return Qtrue;
 }

diff --git a/lib/oj/version.rb b/lib/oj/version.rb
@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.3'
+  VERSION = '3.16.4'
 end