From 1f2def7dd84da6477df1ef9b4e8b39f6ce6f04cb Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 9 Apr 2010 11:32:52 +0000 Subject: [PATCH] * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can precede the last reference). [ruby-dev:40942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dir.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d5aa69a6d..b59dd16bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 9 20:29:13 2010 Yusuke Endoh + + * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can + precede the last reference). [ruby-dev:40942] + Fri Apr 9 20:05:05 2010 Yusuke Endoh * dir.c (push_glob): add RB_GC_GUARD to prevent str being free'ed. diff --git a/dir.c b/dir.c index 6cdccd8b85..9c1c792cbe 100644 --- a/dir.c +++ b/dir.c @@ -1622,17 +1622,15 @@ push_glob(VALUE ary, VALUE str, int flags) { struct glob_args args; rb_encoding *enc = rb_enc_get(str); - int ret; if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding(); args.func = push_pattern; args.value = ary; args.enc = enc; - ret = ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, - rb_glob_caller, (VALUE)&args, enc); RB_GC_GUARD(str); - return ret; + return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, + rb_glob_caller, (VALUE)&args, enc); } static VALUE