akr	2008-01-23 13:40:43 +0900 (Wed, 23 Jan 2008)

  New Revision: 15178

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (rb_reg_prepare_re): fix SEGV by
      /a/ =~ "aa".force_encoding("utf-16be").


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15178&r2=15177&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15178&r2=15177&diff_format=u

Index: re.c
===================================================================
--- re.c	(revision 15177)
+++ re.c	(revision 15178)
@@ -955,7 +955,7 @@
 
     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 @@
             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(&reg2, (UChar* )RSTRING_PTR(unescaped),
 		     (UChar* )(RSTRING_PTR(unescaped) + RSTRING_LEN(unescaped)),
 		     reg->options, enc,
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15177)
+++ ChangeLog	(revision 15178)
@@ -1,3 +1,8 @@
+Wed Jan 23 13:39:48 2008  Tanaka Akira  <akr@f...>
+
+	* re.c (rb_reg_prepare_re): fix SEGV by
+	  /a/ =~ "aa".force_encoding("utf-16be").
+
 Wed Jan 23 11:53:26 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (str_mod_check, str_nth, str_offset): consitfied.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/