diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 23:57:33 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 23:57:33 +0000 |
commit | 0e03a296e63b9694709de9bc462c08de60873a58 (patch) | |
tree | b697f077f94ad2a398eac3bf6cf9d3f0f17bc4cf | |
parent | 70303852733730508621b1185f8032449efafa80 (diff) | |
download | ruby-0e03a296e63b9694709de9bc462c08de60873a58.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | dir.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -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. @@ -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); } |