diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-10 02:29:05 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-10 02:29:05 +0000 |
commit | d433a70b5dca5c501e53d89e155f7bbba17fdbc7 (patch) | |
tree | a8d5aee0f73ff95c2b5fe04bb33982c0617c9853 | |
parent | e8da366e042b102747ed04c9be9a5c5f93b35891 (diff) | |
download | ruby-d433a70b5dca5c501e53d89e155f7bbba17fdbc7.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | re.c | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -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] + Wed Dec 10 01:28:16 2008 NAKAMURA Usaku <usa@ruby-lang.org> * common.mk (win32.obj): depend on headers. @@ -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; |