2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e66bb7de19..41ce686725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 13 20:21:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): should not shadow outer variable not to
+	  return Qnil always.
+
 Mon Jul 13 19:41:05 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* marshal.c (r_object0): copy instance variables to new regexp.
diff --git a/marshal.c b/marshal.c
index 4955fff20d..6b7c79d924 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1393,7 +1393,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	{
 	    volatile VALUE str = r_bytes(arg);
 	    int options = r_byte(arg);
-	    VALUE v = rb_reg_new("", 0, options);
+	    v = rb_reg_new("", 0, options);
 	    if (ivp) {
 		r_ivar(v, arg);
 		*ivp = Qfalse;