diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-31 10:51:26 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-31 10:51:26 +0000 |
| commit | 68180523b64dea925f35741def24560ed4dbf331 (patch) | |
| tree | 809e01115d519d17150ccc2bd348cd2540a8a863 | |
| parent | 817a6b9d1e4d0ccc9da2d55f0a456902c97181bd (diff) | |
merge revision(s) 36e9ed7fef6eb2d14becf6c52452e4ab16e4bf01: [Backport #16698]
backport 80b5a0ff2a7709367178f29d4ebe1c54122b1c27 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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@67873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/json/parser/parser.c | 2 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 2 | ||||
| -rw-r--r-- | version.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index c0a240a732..cd7aeb21bb 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1802,7 +1802,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; diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index 9e1341e90b..4c99643aa9 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -697,7 +697,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; @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.9" -#define RUBY_RELEASE_DATE "2019-10-02" -#define RUBY_PATCHLEVEL 362 +#define RUBY_RELEASE_DATE "2020-03-31" +#define RUBY_PATCHLEVEL 363 -#define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_YEAR 2020 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |