From 94e6598969b76d613188ae9015e5d02f31c622a0 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Aug 2018 14:15:43 +0000
Subject: merge revision(s) 64071: [Backport #14941]

	ruby.c: taint ARGV on Windows

	* ruby.c (external_str_new_cstr): strings come from the external
	  should be tainted.  [ruby-dev:50596] [Bug #14941]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index 4782390a99..1e2579c556 100644
--- a/ruby.c
+++ b/ruby.c
@@ -2069,7 +2069,9 @@ external_str_new_cstr(const char *p)
 {
 #if UTF8_PATH
     VALUE str = rb_utf8_str_new_cstr(p);
-    return str_conv_enc(str, NULL, rb_default_external_encoding());
+    str = str_conv_enc(str, NULL, rb_default_external_encoding());
+    OBJ_TAINT_RAW(str);
+    return str;
 #else
     return rb_external_str_new_cstr(p);
 #endif
-- 
cgit v1.2.3