From ae8ed19dad0b2bbe93f2027682bfe222d6160ca6 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 21 Feb 2008 19:54:48 +0000 Subject: * string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT. * string.c (rb_str_substr): ditto. * encoding.c (rb_enc_compatible): empty string is compatible with not only nonasciicompatible strings. [ruby-dev:33895] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 2efc5f69c..34dccb27d 100644 --- a/string.c +++ b/string.c @@ -857,11 +857,14 @@ rb_str_times(VALUE str, VALUE times) n *= 2; } memcpy(RSTRING_PTR(str2) + n, RSTRING_PTR(str2), len-n); + cr = ENC_CODERANGE(str); + if (cr == ENC_CODERANGE_BROKEN) cr = ENC_CODERANGE_UNKNOWN; + } + else { + cr = ENC_CODERANGE_7BIT; } RSTRING_PTR(str2)[RSTRING_LEN(str2)] = '\0'; OBJ_INFECT(str2, str); - cr = ENC_CODERANGE(str); - if (cr == ENC_CODERANGE_BROKEN) cr = ENC_CODERANGE_UNKNOWN; ENCODING_CODERANGE_SET(str2, rb_enc_get_index(str), cr); return str2; @@ -1238,7 +1241,8 @@ rb_str_substr(VALUE str, long beg, long len) } else { str2 = rb_str_new5(str, p, len); - rb_enc_cr_str_copy(str2, str); + if (len) rb_enc_cr_str_copy(str2, str); + else ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT); OBJ_INFECT(str2, str); } -- cgit