mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
16ab763b1f
commit
fe80d63d68
2 changed files with 6 additions and 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
|
||||
|
|
2
re.c
2
re.c
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue