From f6b821f64432c31c8a9939689ee25f3b67ab39f2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Nov 2008 06:52:06 +0000
Subject: [PATCH] * marshal.c (marshal_load): arg.data is no longer a VALUE but
 a   st_table, and freed in load_ensure.  pointed out by pegacorn.  
 [ruby-dev:37008]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 marshal.c | 1 -
 version.h | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b43b5cc66..7db89b7166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov  3 15:52:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_load): arg.data is no longer a VALUE but a
+	  st_table, and freed in load_ensure.  pointed out by pegacorn.
+	  [ruby-dev:37008]
+
 Fri Oct 31 12:51:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_globs): need taint check.  reported by steve
diff --git a/marshal.c b/marshal.c
index 5c73a389c1..0abb7efbec 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1493,7 +1493,6 @@ marshal_load(argc, argv)
 
     if (!NIL_P(proc)) arg.proc = proc;
     v = rb_ensure(load, (VALUE)&arg, load_ensure, (VALUE)&arg);
-    RBASIC(arg.data)->klass = rb_cHash;
 
     return v;
 }
diff --git a/version.h b/version.h
index 277d73ba2c..a8ae1f48ed 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-10-31"
+#define RUBY_RELEASE_DATE "2008-11-03"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081031
+#define RUBY_RELEASE_CODE 20081103
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 11
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];