diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:40 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:40 +0000 |
commit | 35aefacb16017be8065a84b17262419fe4072ea2 (patch) | |
tree | b8f059edff0a8ba64cf0dcc5fa3f79442ab73bec /re.c | |
parent | e8c9a7a84f4461d90c93100ebc7563a1b9bd24ad (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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; |