From 22d1dba88c81ba4be5f9108885578df0314f832f Mon Sep 17 00:00:00 2001 From: drbrain Date: Mon, 14 Mar 2016 18:36:14 +0000 Subject: * marshal.c (r_object0): Fix Marshal crash for corrupt extended object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index d64e5ffc54..6639e03f45 100644 --- a/marshal.c +++ b/marshal.c @@ -1585,6 +1585,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) { VALUE path = r_unique(arg); VALUE m = rb_path_to_class(path); + if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0); if (RB_TYPE_P(m, T_CLASS)) { /* prepended */ VALUE c; @@ -1604,7 +1605,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) } else { must_be_module(m, path); - if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0); rb_ary_push(extmod, m); v = r_object0(arg, 0, extmod); -- cgit v1.2.3