summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-10 02:29:05 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-10 02:29:05 +0000
commitd433a70b5dca5c501e53d89e155f7bbba17fdbc7 (patch)
treea8d5aee0f73ff95c2b5fe04bb33982c0617c9853 /re.c
parente8da366e042b102747ed04c9be9a5c5f93b35891 (diff)
* re.c (rb_reg_initialize): raise RegexpError when encoding
is dummy encoding. [ruby-dev:37091] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/re.c b/re.c
index 3a2aa5d362..a45ae47d9f 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;