summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-15 07:19:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-15 07:19:25 +0000
commit020fcc95fe948f65b03609d445a6cf1bc0c06dc5 (patch)
tree1fa20b692afb9923c84449d9757d8535f5165e5e /string.c
parentb2a128fa7cabcce182e7360db70b3e50bb39242d (diff)
string.c: fix coderange for non-endianness string
* string.c (rb_enc_str_coderange): dummy wchar, non-endianness encoding string cannot be ascii only. [ruby-core:66835] [Bug #10598] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/string.c b/string.c
index 9006abdfac..9053835ee2 100644
--- a/string.c
+++ b/string.c
@@ -487,8 +487,15 @@ rb_enc_str_coderange(VALUE str)
int cr = ENC_CODERANGE(str);
if (cr == ENC_CODERANGE_UNKNOWN) {
- rb_encoding *enc = STR_ENC_GET(str);
- cr = coderange_scan(RSTRING_PTR(str), RSTRING_LEN(str), enc);
+ int encidx = ENCODING_GET(str);
+ rb_encoding *enc = rb_enc_from_index(encidx);
+ if (rb_enc_mbminlen(enc) > 1 && rb_enc_dummy_p(enc)) {
+ cr = ENC_CODERANGE_BROKEN;
+ }
+ else {
+ cr = coderange_scan(RSTRING_PTR(str), RSTRING_LEN(str),
+ get_actual_encoding(encidx, str));
+ }
ENC_CODERANGE_SET(str, cr);
}
return cr;