naruse	2008-12-10 11:29:05 +0900 (Wed, 10 Dec 2008)

  New Revision: 20603

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

  Log:
    * re.c (rb_reg_initialize): raise RegexpError when encoding
      is dummy encoding. [ruby-dev:37091]

  Modified files:
    trunk/ChangeLog
    trunk/re.c

Index: re.c
===================================================================
--- re.c	(revision 20602)
+++ re.c	(revision 20603)
@@ -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: ChangeLog
===================================================================
--- ChangeLog	(revision 20602)
+++ ChangeLog	(revision 20603)
@@ -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]
+
 Wed Dec 10 01:28:16 2008  NAKAMURA Usaku  <usa@r...>
 
 	* common.mk (win32.obj): depend on headers.

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