summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 05:53:14 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 05:53:14 +0000
commit87661039e7c9063a8d2b0d8b91f3d94682267a7e (patch)
tree76aa5c387625e3f02b1c01ac42baef0ac16589ca
parent0bb75c4a714bae4a50358b8161e1bcc1e00cf144 (diff)
dir.c (dir_s_glob): RB_GC_GUARD instead of volatile
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b2bbf79..17215a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 16 14:52:46 2014 Eric Wong <e@80x24.org>
+
+ * dir.c (dir_s_glob): RB_GC_GUARD instead of volatile
+
Sun Feb 16 14:33:52 2014 Tanaka Akira <akr@fsij.org>
* include/ruby/ruby.h (RBIGNUM_SIGN): Defined for compatibility.
diff --git a/dir.c b/dir.c
index 4f62cb2..f456e8b 100644
--- a/dir.c
+++ b/dir.c
@@ -1912,8 +1912,9 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
ary = rb_push_glob(str, flags);
}
else {
- volatile VALUE v = ary;
+ VALUE v = ary;
ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), flags);
+ RB_GC_GUARD(v);
}
if (rb_block_given_p()) {