1 files changed, 3 insertions, 2 deletions
diff --git a/string.c b/string.c
index 88686db76d..449fb558db 100644
--- a/string.c
+++ b/string.c
@@ -655,12 +655,13 @@ rb_enc_str_coderange(VALUE str)
     if (cr == ENC_CODERANGE_UNKNOWN) {
 	int encidx = ENCODING_GET(str);
 	rb_encoding *enc = rb_enc_from_index(encidx);
-	if (rb_enc_mbminlen(enc) > 1 && rb_enc_dummy_p(enc)) {
+	if (rb_enc_mbminlen(enc) > 1 && rb_enc_dummy_p(enc) &&
+            rb_enc_mbminlen(enc = get_actual_encoding(encidx, str)) == 1) {
 	    cr = ENC_CODERANGE_BROKEN;
 	}
 	else {
 	    cr = coderange_scan(RSTRING_PTR(str), RSTRING_LEN(str),
-				get_actual_encoding(encidx, str));
+                                enc);
 	}
         ENC_CODERANGE_SET(str, cr);
     }