nobu	2012-01-13 18:41:22 +0900 (Fri, 13 Jan 2012)

  New Revision: 34295

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

  Log:
    * sprintf.c (rb_enc_vsprintf): can be used for ASCII compatible
      encodings only.

  Modified files:
    trunk/ChangeLog
    trunk/sprintf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34294)
+++ ChangeLog	(revision 34295)
@@ -1,3 +1,8 @@
+Fri Jan 13 18:41:19 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* sprintf.c (rb_enc_vsprintf): can be used for ASCII compatible
+	  encodings only.
+
 Fri Jan 13 18:29:06 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (rb_mutex_unlock_th): simplified.
Index: sprintf.c
===================================================================
--- sprintf.c	(revision 34294)
+++ sprintf.c	(revision 34295)
@@ -1168,7 +1168,13 @@
     f._bf._size = 0;
     f._w = 120;
     result = rb_str_buf_new(f._w);
-    if (enc) rb_enc_associate(result, enc);
+    if (enc) {
+	if (!rb_enc_asciicompat(enc)) {
+	    rb_raise(rb_eArgError, "cannot construct ASCII-incompatible encoding string: %s",
+		     rb_enc_name(enc));
+	}
+	rb_enc_associate(result, enc);
+    }
     f._bf._base = (unsigned char *)result;
     f._p = (unsigned char *)RSTRING_PTR(result);
     RBASIC(result)->klass = 0;

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