diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-03 09:06:19 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-03 09:06:19 +0000 |
commit | 55530c55dff82bb53c4f162fb9bd15e2a41cdafa (patch) | |
tree | 775eb63a268092fdc8a74f1a1b7e59454f6e49e3 | |
parent | 7476bdc17810c024add10d99c1ff47abb9dd34d9 (diff) | |
download | ruby-55530c55dff82bb53c4f162fb9bd15e2a41cdafa.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ruby.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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 @@ -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 |