mirror of
https://github.com/ruby/ruby.git
synced 2025-08-16 05:59:00 +02:00
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
This commit is contained in:
parent
ba75776346
commit
94e6598969
3 changed files with 11 additions and 2 deletions
4
ruby.c
4
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue