1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dir.c: GC guard

Browse Source 
* dir.c (do_opendir): prevent intermediate string for transcoding
  from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-03 04:43:52 +00:00
parent 73cce16240
commit 3e2942423e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dir.c
View File

@ -1134,7 +1134,7 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
{ {
DIR *dirp; DIR *dirp;
#ifdef _WIN32 #ifdef _WIN32
volatile VALUE tmp; VALUE tmp = 0;
if (enc != rb_usascii_encoding() && if (enc != rb_usascii_encoding() &&
enc != rb_ascii8bit_encoding() && enc != rb_ascii8bit_encoding() &&
enc != rb_utf8_encoding()) { enc != rb_utf8_encoding()) {
@ -1146,6 +1146,9 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
dirp = opendir(path); dirp = opendir(path);
if (dirp == NULL && !to_be_ignored(errno)) if (dirp == NULL && !to_be_ignored(errno))
sys_warning(path); sys_warning(path);
#ifdef _WIN32
if (tmp) rb_str_resize(tmp, 0); /* GC guard */
#endif
return dirp; return dirp;
} }