merges r30601 from trunk into ruby_1_9_2.

--
    * proc.c (proc_call): Add gc guard to avoid segfault. The fix
      is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 1109c4916a..42e52ee0c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 19 13:04:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
+	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
+
 Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* parse.y: avoid NULL reference.  [ruby-dev:43067]
diff --git a/proc.c b/proc.c
index 7df2ec890b..7b1d1474a8 100644
--- a/proc.c
+++ b/proc.c
@@ -540,16 +540,16 @@ proc_call(int argc, VALUE *argv, VALUE procval)
     rb_proc_t *proc;
     rb_block_t *blockptr = 0;
     rb_iseq_t *iseq;
+    VALUE passed_procval;
     GetProcPtr(procval, proc);
 
     iseq = proc->block.iseq;
     if (BUILTIN_TYPE(iseq) == T_NODE || iseq->arg_block != -1) {
 	if (rb_block_given_p()) {
-	    rb_proc_t *proc;
-	    VALUE procval;
-	    procval = rb_block_proc();
-	    GetProcPtr(procval, proc);
-	    blockptr = &proc->block;
+	    rb_proc_t *passed_proc;
+	    RB_GC_GUARD(passed_procval) = rb_block_proc();
+	    GetProcPtr(passed_procval, passed_proc);
+	    blockptr = &passed_proc->block;
 	}
     }
 
diff --git a/version.h b/version.h
index c9a27d8d1f..0e19924a23 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 167
+#define RUBY_PATCHLEVEL 168
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1