merges r20603 from trunk into ruby_1_9_1.

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

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8dfb2ed20..5f3901170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 10 11:25:53 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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@it.aoyama.ac.jp>
 
 	* enc/trans/single_byte.trans, cp850-tbl.rb, cp852-tbl.rb,
diff --git a/re.c b/re.c
index 3a2aa5d36..a45ae47d9 100644
--- a/re.c
+++ b/re.c
@@ -2312,6 +2312,11 @@ rb_reg_initialize(VALUE obj, const char *s, int len, rb_encoding *enc,
         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;