diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 07:36:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 07:36:29 +0000 |
| commit | 3ca8a17b2cf605f303914f1a286b277dc3dfdffc (patch) | |
| tree | ad8ab63a76435c79a7232864ffa963f6b3031229 | |
| parent | 239c51b9d3721badb2c393659cf176840e4398cc (diff) | |
| download | ruby-3ca8a17b2cf605f303914f1a286b277dc3dfdffc.tar.gz ruby-3ca8a17b2cf605f303914f1a286b277dc3dfdffc.tar.xz ruby-3ca8a17b2cf605f303914f1a286b277dc3dfdffc.zip | |
* encoding.c (rb_enc_associate_index): cannot set encoding on
special constants.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,4 @@ -Thu Aug 6 16:26:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Aug 6 16:36:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (valid_encoding_name_p): rejects too long encoding names. @@ -8,6 +8,9 @@ Thu Aug 6 16:26:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding capable. + * encoding.c (rb_enc_associate_index): cannot set encoding on + special constants. + Thu Aug 6 15:44:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_method.c (rb_method_entry_eq): deals with optimized method diff --git a/encoding.c b/encoding.c index 67f2dd8ae..1b0622c19 100644 --- a/encoding.c +++ b/encoding.c @@ -640,6 +640,9 @@ rb_enc_associate_index(VALUE obj, int idx) /* enc_check_capable(obj);*/ if (rb_enc_get_index(obj) == idx) return obj; + if (SPECIAL_CONST_P(obj)) { + rb_raise(rb_eArgError, "cannot set encoding"); + } if (!ENC_CODERANGE_ASCIIONLY(obj) || !rb_enc_asciicompat(rb_enc_from_index(idx))) { ENC_CODERANGE_CLEAR(obj); |