diff options
| -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 |