summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 15:13:18 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 15:13:18 +0000
commit5e62997245434daff576be3107086a7e81e46408 (patch)
tree993e53b0ea1632cee2d14158e6b7d3e919643432 /string.c
parentb317b345e89b1d8f3daa207973fc34d9b3f13e32 (diff)
* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
encoding is US-ASCII and string contains 8bit characters. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/string.c b/string.c
index 9db82d4a21..7056c1ec8e 100644
--- a/string.c
+++ b/string.c
@@ -538,6 +538,11 @@ rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *eenc)
VALUE str;
str = rb_tainted_str_new(ptr, len);
+ if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT &&
+ eenc == rb_usascii_encoding()) {
+ rb_enc_associate(str, rb_ascii8bit_encoding());
+ return str;
+ }
rb_enc_associate(str, eenc);
return rb_str_conv_enc(str, eenc, rb_default_internal_encoding());
}