* dir.c (dir_s_glob): restore GC protection volatile variable.

  [ruby-dev:29588]

* re.c (rb_reg_regcomp): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2335ae6bf..19faf0dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 18 15:29:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): restore GC protection volatile variable.
+	  [ruby-dev:29588]
+
+	* re.c (rb_reg_regcomp): ditto.
+
 Mon Sep 18 12:16:48 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (fix_mul): get rid of shift overflow.
diff --git a/dir.c b/dir.c
index 13f1a51c7..be594b439 100644
--- a/dir.c
+++ b/dir.c
@@ -1629,7 +1629,8 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 	ary = rb_push_glob(str, flags);
     }
     else {
-	ary = dir_globs(RARRAY_LEN(ary), RARRAY_PTR(ary), flags);
+	volatile VALUE v = ary;
+	ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
     }
 
     if (rb_block_given_p()) {
diff --git a/re.c b/re.c
index 8f4d14dfc..1a01490e5 100644
--- a/re.c
+++ b/re.c
@@ -1508,6 +1508,7 @@ static VALUE reg_cache;
 VALUE
 rb_reg_regcomp(VALUE str)
 {
+    volatile VALUE save_str = str;
     if (reg_cache && RREGEXP(reg_cache)->len == RSTRING_LEN(str)
 	&& case_cache == ruby_ignorecase
 	&& kcode_cache == reg_kcode
@@ -1516,7 +1517,7 @@ rb_reg_regcomp(VALUE str)
 
     case_cache = ruby_ignorecase;
     kcode_cache = reg_kcode;
-    return reg_cache = rb_reg_new(RSTRING_PTR(str), RSTRING_LEN(str),
+    return reg_cache = rb_reg_new(RSTRING_PTR(save_str), RSTRING_LEN(save_str),
 				  ruby_ignorecase);
 }