diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-20 19:44:05 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-20 19:44:05 +0000 |
commit | fe80d63d68cc2a09e2af0d01c540546d5d221f2d (patch) | |
tree | 0e95865f381c2b253755b8056586aa83ea63b71b | |
parent | 16ab763b1fb762eb8d837267ba6e7c7939d7d6db (diff) | |
download | ruby-fe80d63d68cc2a09e2af0d01c540546d5d221f2d.tar.gz |
* re.c (rb_reg_s_union): useless rb_enc_get call removed to prevent
SEGV by Regexp.union("", nil).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | re.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jul 21 04:42:15 2008 Tanaka Akira <akr@fsij.org> + + * re.c (rb_reg_s_union): useless rb_enc_get call removed to prevent + SEGV by Regexp.union("", nil). + Sun Jul 20 22:50:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (iseq_compile_each): NODE_POSTEXE should set each end @@ -3018,7 +3018,7 @@ rb_reg_s_union(VALUE self, VALUE args0) v = rb_reg_to_s(v); } else { - rb_encoding *enc = rb_enc_get(e); + rb_encoding *enc; StringValue(e); enc = rb_enc_get(e); if (!rb_enc_str_asciicompat_p(e)) { |