yugui	2008-12-13 10:01:40 +0900 (Sat, 13 Dec 2008)

  New Revision: 20690

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20690

  Log:
    merges r20603 from trunk into ruby_1_9_1.
    * re.c (rb_reg_initialize): raise RegexpError when encoding
      is dummy encoding. [ruby-dev:37091]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/re.c

Index: ruby_1_9_1/re.c
===================================================================
--- ruby_1_9_1/re.c	(revision 20689)
+++ ruby_1_9_1/re.c	(revision 20690)
@@ -2312,6 +2312,11 @@
         rb_raise(rb_eTypeError, "already initialized regexp");
     re->ptr = 0;
 
+    if (rb_enc_dummy_p(enc)) {
+	    strcpy(err, "can't make regexp with dummy encoding");
+	    return -1;
+    }
+
     unescaped = rb_reg_preprocess(s, s+len, enc, &fixed_enc, err);
     if (unescaped == Qnil)
         return -1;
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20689)
+++ ruby_1_9_1/ChangeLog	(revision 20690)
@@ -1,3 +1,8 @@
+Wed Dec 10 11:25:53 2008  NARUSE, Yui  <naruse@r...>
+
+	* re.c (rb_reg_initialize): raise RegexpError when encoding
+	  is dummy encoding. [ruby-dev:37091]
+
 Tue Dec  9 18:35:35 2008  Martin Duerst  <duerst@i...>
 
 	* enc/trans/single_byte.trans, cp850-tbl.rb, cp852-tbl.rb,

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