* eval.c (rb_eval): local_vars[-1] should protect body, not a

  local_tbl.

* marshal.c (w_object): check if klass is really a class.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/marshal.c b/marshal.c
index fa63e3cfb1..7575fa98f7 100644
--- a/marshal.c
+++ b/marshal.c
@@ -995,6 +995,9 @@ r_object(arg)
 	    VALUE klass;
 
 	    klass = rb_path2class(r_unique(arg));
+	    if (TYPE(klass) != T_CLASS) {
+		rb_raise(rb_eArgError, "dump format error");
+	    }
 	    v = rb_obj_alloc(klass);
 	    if (TYPE(v) != T_OBJECT) {
 		rb_raise(rb_eArgError, "dump format error");