backport 80b5a0ff2a partially as a securify fix for CVE-2020-10663.

The patch was provided by Jeremy Evans.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2020-03-20 08:12:05 +00:00
parent b16ddc13f0
commit 36e9ed7fef
3 changed files with 3 additions and 3 deletions

View file

@ -1835,7 +1835,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
} else {
json->max_nesting = 100;
json->allow_nan = 0;
json->create_additions = 1;
json->create_additions = 0;
json->create_id = rb_funcall(mJSON, i_create_id, 0);
json->object_class = Qnil;
json->array_class = Qnil;

View file

@ -730,7 +730,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
} else {
json->max_nesting = 100;
json->allow_nan = 0;
json->create_additions = 1;
json->create_additions = 0;
json->create_id = rb_funcall(mJSON, i_create_id, 0);
json->object_class = Qnil;
json->array_class = Qnil;

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.6"
#define RUBY_RELEASE_DATE "2020-03-20"
#define RUBY_PATCHLEVEL 141
#define RUBY_PATCHLEVEL 142
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3