diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-23 04:40:43 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-23 04:40:43 +0000 |
commit | 48f4ae061354c1f74918b0b1fc6e7b5277c0b779 (patch) | |
tree | 67191e4babf88d3080714963eba86c911bc0f9da /re.c | |
parent | 83ea7a5e0858e0fb4db0e7044e652d3d299a54c9 (diff) | |
download | ruby-48f4ae061354c1f74918b0b1fc6e7b5277c0b779.tar.gz ruby-48f4ae061354c1f74918b0b1fc6e7b5277c0b779.tar.xz ruby-48f4ae061354c1f74918b0b1fc6e7b5277c0b779.zip |
* re.c (rb_reg_prepare_re): fix SEGV by
/a/ =~ "aa".force_encoding("utf-16be").
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -955,7 +955,7 @@ rb_reg_prepare_re(VALUE re, VALUE str) rb_reg_check(re); /* ignorecase status */ - if (rb_reg_fixed_encoding_p(re)) { + if (rb_reg_fixed_encoding_p(re) || !rb_enc_str_asciicompat_p(str)) { if (ENCODING_GET(re) != rb_enc_get_index(str) && rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) { rb_raise(rb_eArgError, @@ -994,6 +994,10 @@ rb_reg_prepare_re(VALUE re, VALUE str) RREGEXP(re)->str, RREGEXP(re)->str + RREGEXP(re)->len, enc, &fixed_enc, err); + if (unescaped == Qnil) { + rb_raise(rb_eArgError, "regexp preprocess failed: %s", err); + } + r = onig_new(®2, (UChar* )RSTRING_PTR(unescaped), (UChar* )(RSTRING_PTR(unescaped) + RSTRING_LEN(unescaped)), reg->options, enc, |