From 440a6b5d1cc7c49e364d5803993d55596bc4530b Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 30 Jun 2018 13:06:35 +0000 Subject: merge revision(s) 60596,60599: [Backport #14060] file.c: infect from arguments * file.c (rb_check_realpath_internal): infetct the result with arguments, no taint if none are tainted and cwd is not used. [ruby-core:83583] [Bug #14060] file.c: infect from arguments * file.c (rb_check_realpath_internal): infetct the result with arguments, no taint if none are tainted and cwd is not used. [ruby-core:83583] [Bug #14060] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@63807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'file.c') diff --git a/file.c b/file.c index f321b57f08..0504ad7242 100644 --- a/file.c +++ b/file.c @@ -3979,7 +3979,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode if (origenc != enc && rb_enc_str_asciionly_p(resolved)) rb_enc_associate(resolved, origenc); - OBJ_TAINT(resolved); + OBJ_INFECT(resolved, unresolved_path); return resolved; } -- cgit v1.2.3