diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:43:06 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:43:06 +0000 |
commit | 49d542f6d32381c44721fd4a89e423d489c8bec7 (patch) | |
tree | f4eed3b319e1f7fe2f0e425f966c376caa159ecd /hash.c | |
parent | e2283c62f56de6b77e59dce5c239aa8400926a4c (diff) |
merge revision(s) 64860,64861: [Backport #15164]
fallback env encoding to ASCII-8BIT
* hash.c (env_enc_str_new): as no locale/filesystem encoding is
available in miniruby on Windows, fallback the encoding to
ASCII-8BIT so it is valid encoding when the conversion failed.
[ruby-core:89177] [Bug #15164]
* properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3262,7 +3262,7 @@ env_enc_str_new(const char *ptr, long len, rb_encoding *enc) rb_encoding *utf8 = rb_utf8_encoding(); VALUE str = rb_enc_str_new(NULL, 0, (internal ? internal : enc)); if (NIL_P(rb_str_cat_conv_enc_opts(str, 0, ptr, len, utf8, ecflags, Qnil))) { - rb_str_initialize(str, ptr, len, utf8); + rb_str_initialize(str, ptr, len, NULL); } #else VALUE str = rb_external_str_new_with_enc(ptr, len, enc); |