1 files changed, 3 insertions, 0 deletions
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++) {