diff options
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -8639,18 +8639,11 @@ str_compat_and_valid(VALUE str, rb_encoding *enc) if (cr == ENC_CODERANGE_BROKEN) { rb_raise(rb_eArgError, "replacement must be valid byte sequence '%+"PRIsVALUE"'", str); } - else if (cr == ENC_CODERANGE_7BIT) { - rb_encoding *e = STR_ENC_GET(str); - if (!rb_enc_asciicompat(enc)) { - rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", - rb_enc_name(enc), rb_enc_name(e)); - } - } - else { /* ENC_CODERANGE_VALID */ + else { rb_encoding *e = STR_ENC_GET(str); - if (enc != e) { + if (cr == ENC_CODERANGE_7BIT ? rb_enc_mbminlen(enc) != 1 : enc != e) { rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", - rb_enc_name(enc), rb_enc_name(e)); + rb_enc_name(enc), rb_enc_name(e)); } } return str; |