From cab0b0bf6d543f7b1930a1bf760fd600468ac25d Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 9 Jan 2008 04:07:11 +0000 Subject: * string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange value if it's given from outside. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index d72d0352c..57b5cd837 100644 --- a/string.c +++ b/string.c @@ -1076,12 +1076,14 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, (ptr_a8 && str_cr != ENC_CODERANGE_7BIT)) { ptr_cr = ENC_CODERANGE_UNKNOWN; } - else { + else if (ptr_cr == ENC_CODERANGE_UNKNOWN) { ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); } } else { - ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); + if (ptr_cr == ENC_CODERANGE_UNKNOWN) { + ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); + } if (str_cr == ENC_CODERANGE_UNKNOWN) { if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) { str_cr = rb_enc_str_coderange(str); -- cgit