From f03642038e3c0f8c387226d845b0910179c0d72a Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Jul 2009 16:26:08 +0000
Subject: [PATCH] * marshal.c (r_object0): should return real object.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 20 ++++++++++++--------
 marshal.c |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e4ca43040..8ae014266f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
+Tue Jul 14 01:24:56 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): should return real object.
+
 Tue Jul 14 01:06:31 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
- 	* enumerator.c (yielder_yield_i): use rb_proc_new instead of
- 	  rb_iterate.  [ruby-dev:38518]
- 
- 	* README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
- 	  instead.
- 
- 	* README.EXT.ja: ditto.
+	* enumerator.c (yielder_yield_i): use rb_proc_new instead of
+	  rb_iterate.  [ruby-dev:38518]
+
+	* README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
+	  instead.
+
+	* README.EXT.ja: ditto.
 
 Tue Jul 14 00:45:41 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
@@ -5761,7 +5765,7 @@ Tue Jan 13 18:21:44 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 Tue Jan 13 18:19:49 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
-          (also see [ruby-dev:37721])
+	  (also see [ruby-dev:37721])
 
 Tue Jan 13 17:29:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/marshal.c b/marshal.c
index 6b7c79d924..5cdd2176b8 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1406,7 +1406,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    }
 	    str = r_entry(rb_reg_new_str(str, options), arg);
 	    rb_copy_generic_ivar(str, v);
-	    v = r_leave(v, arg);
+	    v = r_leave(str, arg);
 	}
 	break;