diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-31 10:36:30 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-31 10:36:30 +0000 |
| commit | 673de310fb9ad84ea444fe3084c2490590a52589 (patch) | |
| tree | 9da89ac56740b60e0ee455f67d3cdfc2988a5d88 | |
| parent | 471a70fbffbc52fc2fcc28d7ef8eefd141c0812c (diff) | |
merge revision(s) 64879: [Backport #15162]
transcode.c: add GC guard on raise
* transcode.c (econv_s_search_convpath): add GC guard to fix SEGV
on raise.
[Bug #15162] [ruby-core:89172]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@66961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | transcode.c | 8 | ||||
| -rw-r--r-- | version.h | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/transcode.c b/transcode.c index 2c0b30ca0e..84c579eb2e 100644 --- a/transcode.c +++ b/transcode.c @@ -3150,8 +3150,12 @@ econv_s_search_convpath(int argc, VALUE *argv, VALUE klass) convpath = Qnil; transcode_search_path(sname, dname, search_convpath_i, &convpath); - if (NIL_P(convpath)) - rb_exc_raise(rb_econv_open_exc(sname, dname, ecflags)); + if (NIL_P(convpath)) { + VALUE exc = rb_econv_open_exc(sname, dname, ecflags); + RB_GC_GUARD(snamev); + RB_GC_GUARD(dnamev); + rb_exc_raise(exc); + } if (decorate_convpath(convpath, ecflags) == -1) { VALUE exc = rb_econv_open_exc(sname, dname, ecflags); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.6" -#define RUBY_RELEASE_DATE "2018-10-24" -#define RUBY_PATCHLEVEL 336 +#define RUBY_RELEASE_DATE "2019-01-31" +#define RUBY_PATCHLEVEL 337 -#define RUBY_RELEASE_YEAR 2018 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_YEAR 2019 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |