diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | encoding.c | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -3,6 +3,9 @@ Thu Aug 6 16:25:08 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. + Wed Aug 5 19:11:01 2009 NARUSE, Yui <naruse@ruby-lang.org> * ruby.c (rb_stdio_set_default_encoding): declared. 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); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 278 +#define RUBY_PATCHLEVEL 279 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |