nobu	2009-08-06 16:36:29 +0900 (Thu, 06 Aug 2009)

  New Revision: 24425

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24425

  Log:
    * encoding.c (rb_enc_associate_index): cannot set encoding on
      special constants.

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 24424)
+++ encoding.c	(revision 24425)
@@ -640,6 +640,9 @@
 /*    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);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24424)
+++ ChangeLog	(revision 24425)
@@ -1,4 +1,4 @@
-Thu Aug  6 16:26:46 2009  Nobuyoshi Nakada  <nobu@r...>
+Thu Aug  6 16:36:25 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (valid_encoding_name_p): rejects too long encoding
 	  names.
@@ -8,6 +8,9 @@
 	* 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@r...>
 
 	* vm_method.c (rb_method_entry_eq): deals with optimized method

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/