diff --git a/ChangeLog b/ChangeLog
index bb78fa70fd..f362e85893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep  9 01:59:08 2007  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (r_object0): check T_STRUCT type for structs.
+
 Sun Sep  9 01:17:05 2007  Tanaka Akira  <akr@fsij.org>
 
 	* marshal.c (r_object0): don't call user-defined initialize for
diff --git a/marshal.c b/marshal.c
index cb5169bec1..f540e52f37 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1263,6 +1263,9 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
             }
 
             v = rb_obj_alloc(klass);
+	    if (TYPE(v) != T_STRUCT) {
+		rb_raise(rb_eArgError, "dump format error");
+	    }
 	    v = r_entry(v, arg);
 	    values = rb_ary_new2(len);
 	    for (i=0; i<len; i++) {