From aa13a2ecd46daa91dc72674763337c868ec2b1cb Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 24 Jan 2008 02:17:26 +0000 Subject: * string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is not compatible with any other encoding. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index 0dfb09867..3ac56b56c 100644 --- a/string.c +++ b/string.c @@ -1140,8 +1140,13 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, } } else { + rb_encoding *str_enc = rb_enc_from_index(str_encindex); + rb_encoding *ptr_enc = rb_enc_from_index(ptr_encindex); + if (!rb_enc_asciicompat(str_enc) || !rb_enc_asciicompat(ptr_enc)) { + goto incompatible; + } if (ptr_cr == ENC_CODERANGE_UNKNOWN) { - ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); + ptr_cr = coderange_scan(ptr, len, ptr_enc); } if (str_cr == ENC_CODERANGE_UNKNOWN) { if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) { @@ -1155,6 +1160,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, if (str_encindex != ptr_encindex && str_cr != ENC_CODERANGE_7BIT && ptr_cr != ENC_CODERANGE_7BIT) { +incompatible: rb_raise(rb_eArgError, "append incompatible encoding strings: %s and %s", rb_enc_name(rb_enc_from_index(str_encindex)), rb_enc_name(rb_enc_from_index(ptr_encindex))); -- cgit