* dir.c (push_glob): re-fix GC problem.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2009-07-15 23:57:33 +00:00
parent 7030385273
commit 0e03a296e6
2 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,7 @@
Thu Jul 16 08:56:32 2009 Koichi Sasada <ko1@atdot.net>
* dir.c (push_glob): re-fix GC problem.
Thu Jul 16 08:55:27 2009 Koichi Sasada <ko1@atdot.net>
* common.mk: add method.h.

3
dir.c
View File

@ -1561,14 +1561,13 @@ push_glob(VALUE ary, VALUE str, int flags)
{
struct glob_args args;
rb_encoding *enc = rb_enc_get(str);
volatile VALUE vstr = str; /* for GC mark */
if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
args.func = push_pattern;
args.value = ary;
args.enc = enc;
return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
return ruby_brace_glob0(StringValuePtr(str), flags | GLOB_VERBOSE,
rb_glob_caller, (VALUE)&args, enc);
}