archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 64860,64861: [Backport #15164]

Browse source 
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
This commit is contained in:
nagachika 2018-10-09 14:43:06 +00:00
parent e2283c62f5
commit 49d542f6d3
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bootstraptest/test_env.rb Normal file
View file

@ -0,0 +1,12 @@
assert_equal "true", %q{
ENV["ENVTEST"] = "\u{e9 3042 d76c}"
env = ENV["ENVTEST"]
env.valid_encoding?
}
# different encoding is used for PATH
assert_equal "true", %q{
ENV["PATH"] = "\u{e9 3042 d76c}"
env = ENV["PATH"]
env.valid_encoding?
}

2
hash.c
View file

@ -3262,7 +3262,7 @@ env_enc_str_new(const char *ptr, long len, rb_encoding *enc)
rb_encoding *utf8 = rb_utf8_encoding(); rb_encoding *utf8 = rb_utf8_encoding();
VALUE str = rb_enc_str_new(NULL, 0, (internal ? internal : enc)); 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))) { 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 #else
VALUE str = rb_external_str_new_with_enc(ptr, len, enc); VALUE str = rb_external_str_new_with_enc(ptr, len, enc);

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.2" #define RUBY_VERSION "2.5.2"
#define RUBY_RELEASE_DATE "2018-10-09" #define RUBY_RELEASE_DATE "2018-10-09"
#define RUBY_PATCHLEVEL 95 #define RUBY_PATCHLEVEL 96
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10