diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:35:29 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:35:29 +0000 |
| commit | 217fbb2cf0cebeef643d1c7b5af10eef62658e1f (patch) | |
| tree | fac255f8ec7aab86f5ddc690bb6206ed43f8ca77 /encoding.c | |
| parent | ff3f19a16ce2c65fd198067a7f74470200bca3e3 (diff) | |
merges r24425 from trunk into ruby_1_9_1.
--
* encoding.c (rb_enc_associate_index): cannot set encoding on
special constants.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index faebdfac86..bc960c26a7 100644 --- a/encoding.c +++ b/encoding.c @@ -617,6 +617,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); |