diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 09:19:56 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 09:19:56 +0000 |
| commit | 477c282a079a1784a0b8c236e7449712be07cae4 (patch) | |
| tree | 45fcd3fcae0c6ebf565fa12caaa4c4a1883c2959 /ChangeLog | |
| parent | d86cba89d8ffd9339bf3a4755774dd1f8a78cc52 (diff) | |
merge revision(s) 54105,54108,54136,54138: [Backport #12188]
* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
* marshal.c (r_object0): raise ArgumentError when linking to undefined
object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,12 @@ +Fri Mar 25 18:18:29 2016 Eric Hodel <drbrain@segment7.net> + + * marshal.c (r_object0): raise ArgumentError when linking to undefined + object. + +Fri Mar 25 18:18:29 2016 Eric Hodel <drbrain@segment7.net> + + * marshal.c (r_object0): Fix Marshal crash for corrupt extended object. + Fri Mar 25 18:07:48 2016 Yutaka Kanemoto <kanemoto@ruby-lang.org> * cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size |