diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sprintf.c | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jan 13 18:41:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_enc_vsprintf): can be used for ASCII compatible + encodings only. + Fri Jan 13 18:29:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (rb_mutex_unlock_th): simplified. @@ -1168,7 +1168,13 @@ rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap) 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; |