1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* hasn.c (env_str_new): taint the string. get rid of a test failure

introduced at r55811.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-08-05 14:19:26 +00:00
parent 743c279d70
commit 549605c15d
2 changed files with 6 additions and 0 deletions

View file

@ -1,3 +1,8 @@
Fri Aug 5 23:18:35 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* hasn.c (env_str_new): taint the string. get rid of a test failure
introduced at r55811.
Fri Aug 5 17:04:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via

1
hash.c
View file

@ -2944,6 +2944,7 @@ env_str_new(const char *ptr, long len)
{
#ifdef _WIN32
VALUE str = env_str_transcode(rb_utf8_str_new(ptr, len), rb_locale_encoding());
OBJ_TAINT(str); /* rb_locale_str_new makes tainted string, but rb_utf8_str_new doesn't */
#else
VALUE str = rb_locale_str_new(ptr, len);
#endif