kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* marshal.c (r_leave): move proc invocation from r_entry() to

Browse source 
avoid potential crash.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-09-29 08:17:48 +00:00
parent 6108fcdc53
commit 0d07755472
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 29 17:14:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (r_leave): move proc invocation from r_entry() to
avoid potential crash.
Sat Sep 29 12:28:08 2007 Tanaka Akira <akr@fsij.org> Sat Sep 29 12:28:08 2007 Tanaka Akira <akr@fsij.org>
* bootstraptest/runner.rb (assert_normal_exit): new method. * bootstraptest/runner.rb (assert_normal_exit): new method.

8
marshal.c
View file

@ -1016,9 +1016,6 @@ r_entry(VALUE v, struct load_arg *arg)
if ((VALUE)real_obj != Qundef) if ((VALUE)real_obj != Qundef)
OBJ_TAINT((VALUE)real_obj); OBJ_TAINT((VALUE)real_obj);
} }
if (arg->proc) {
v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
}
return v; return v;
} }
@ -1035,7 +1032,10 @@ r_leave(VALUE v, struct load_arg *arg)
compat->loader(real_obj, v); compat->loader(real_obj, v);
} }
st_delete(arg->compat_tbl, &key, 0); st_delete(arg->compat_tbl, &key, 0);
return real_obj; v = real_obj;
}
if (arg->proc) {
v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
} }
return v; return v;
} }