From 40236a58c6c9c10e9041a889eb843ee581c6b156 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 8 Dec 2010 08:09:14 +0000 Subject: merges r29676 from trunk into ruby_1_9_2. -- * string.c (rb_enc_cr_str_buf_cat): concatenation of valid encoding string and invalid encoding string should result invalid encoding. [ruby-core:33027] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index c9110e8516..bee5fb100b 100644 --- a/string.c +++ b/string.c @@ -1884,7 +1884,10 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, } else if (str_cr == ENC_CODERANGE_VALID) { res_encindex = str_encindex; - res_cr = str_cr; + if (ptr_cr == ENC_CODERANGE_7BIT || ptr_cr == ENC_CODERANGE_VALID) + res_cr = str_cr; + else + res_cr = ptr_cr; } else { /* str_cr == ENC_CODERANGE_BROKEN */ res_encindex = str_encindex; -- cgit v1.2.3