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

dir.c: GC guard

Browse source 
* dir.c (dir_initialize): add GC guard for retrying.  the argument
  of RSTRING_PTR() may be eliminated by optimization.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-07 10:18:45 +00:00
parent 376c4e8100
commit 79219d9656
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dir.c
View file

@ -445,6 +445,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
rb_encoding *fsenc; rb_encoding *fsenc;
VALUE dirname, opt, orig; VALUE dirname, opt, orig;
static ID keyword_ids[1]; static ID keyword_ids[1];
const char *path;
if (!keyword_ids[0]) { if (!keyword_ids[0]) {
keyword_ids[0] = rb_intern("encoding"); keyword_ids[0] = rb_intern("encoding");
@ -472,13 +473,15 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
dp->dir = NULL; dp->dir = NULL;
dp->path = Qnil; dp->path = Qnil;
dp->enc = fsenc; dp->enc = fsenc;
dp->dir = opendir(RSTRING_PTR(dirname)); path = RSTRING_PTR(dirname);
dp->dir = opendir(path);
if (dp->dir == NULL) { if (dp->dir == NULL) {
if (errno == EMFILE || errno == ENFILE) { if (errno == EMFILE || errno == ENFILE) {
rb_gc(); rb_gc();
dp->dir = opendir(RSTRING_PTR(dirname)); dp->dir = opendir(path);
} }
if (dp->dir == NULL) { if (dp->dir == NULL) {
RB_GC_GUARD(dirname);
rb_sys_fail_path(orig); rb_sys_fail_path(orig);
} }
} }