* encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]

* string.c (rb_str_times): fix broken case. [ruby-dev:33826]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/string.c b/string.c
index c240f0ec75..6177059738 100644
--- a/string.c
+++ b/string.c
@@ -758,6 +758,7 @@ rb_str_times(VALUE str, VALUE times)
 {
     VALUE str2;
     long n, len;
+    int cr;
 
     len = NUM2LONG(times);
     if (len < 0) {
@@ -779,7 +780,9 @@ rb_str_times(VALUE str, VALUE times)
     }
     RSTRING_PTR(str2)[RSTRING_LEN(str2)] = '\0';
     OBJ_INFECT(str2, str);
-    ENCODING_CODERANGE_SET(str2, rb_enc_get_index(str), ENC_CODERANGE(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;
 }