kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby.c (process_options): need to duplicate path before passing it to

Browse source 
rb_str_conv_enc() because the function might call rb_enc_associate()
  internally.  this fixes test failures on Windows introduced at r55260.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-06-03 09:06:19 +00:00
parent b30bbc38fc
commit 8f86f5d691
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Jun 3 18:04:37 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* ruby.c (process_options): need to duplicate path before passing it to
rb_str_conv_enc() because the function might call rb_enc_associate()
internally. this fixes test failures on Windows introduced at r55260.
Fri Jun 3 17:44:25 2016 Reiner Herrmann <reiner@reiner-h.de>
* lib/mkmf.rb (create_makefile): sort lists of source and object

2
ruby.c
View file

@ -1568,7 +1568,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
VALUE path = RARRAY_AREF(load_path, i);
int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
#if UTF8_PATH
path = rb_str_conv_enc(path, uenc, lenc);
path = rb_str_conv_enc(rb_str_dup(path), uenc, lenc);
#else
path = rb_enc_associate(rb_str_dup(path), lenc);
#endif