summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 19:05:36 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 19:05:36 +0000
commit18ae1ce5ce711de2b182fa09d93d1d80f8f7377e (patch)
tree45a752c60a9a08d681a792b70f43c89903b638a2
parent8af31b6ed70ffbce83b13b4384c6b33fd64579da (diff)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c6
-rw-r--r--version.h10
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f66ac101da..3b2e0e7460e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 04:05:20 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_extended): erroneous check condition when dump
+ method is defined. [ruby-core:10646]
+
Sat Jun 9 10:40:00 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* stable version 1.8.5-p52 released.
diff --git a/marshal.c b/marshal.c
index 386a3e6206b..b338c15e14f 100644
--- a/marshal.c
+++ b/marshal.c
@@ -373,8 +373,8 @@ w_extended(klass, arg, check)
{
char *path;
- if (FL_TEST(klass, FL_SINGLETON)) {
- if (check && RCLASS(klass)->m_tbl->num_entries ||
+ if (check && FL_TEST(klass, FL_SINGLETON)) {
+ if (RCLASS(klass)->m_tbl->num_entries ||
(RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) {
rb_raise(rb_eTypeError, "singleton can't be dumped");
}
@@ -652,13 +652,13 @@ w_object(obj, arg, limit)
{
VALUE v;
- w_class(TYPE_DATA, obj, arg, Qtrue);
if (!rb_respond_to(obj, s_dump_data)) {
rb_raise(rb_eTypeError,
"no marshal_dump is defined for class %s",
rb_obj_classname(obj));
}
v = rb_funcall(obj, s_dump_data, 0);
+ w_class(TYPE_DATA, obj, arg, Qtrue);
w_object(v, arg, limit);
}
break;
diff --git a/version.h b/version.h
index 97e355b1540..0e4a11fc123 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-06-09"
+#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070609
-#define RUBY_PATCHLEVEL 53
+#define RUBY_RELEASE_CODE 20070816
+#define RUBY_PATCHLEVEL 54
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 16
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];