diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-10-09 15:05:24 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-10-09 15:05:24 +0900 |
| commit | fe9d33beb78d5c7932a5c2ca3953045c0ae751d5 (patch) | |
| tree | 3481e3a7b27b2cd5fdb1775ac3e9239c1cc8c32e /include/ruby | |
| parent | f192e01233ccd7966721a164e62a86707b4e6d9e (diff) | |
merge revision(s) 89242279e61b023a81c58065c62a82de8829d0b3,529fc204af84f825f98f83c34b004acbaa802615: [Backport #18141]
Marshal.load: do not call the proc until strings have their encoding
Ref: https://bugs.ruby-lang.org/issues/18141
---
marshal.c | 7 +++-
spec/ruby/core/marshal/shared/load.rb | 62 +++++++++++++++++++++++------------
test/ruby/test_marshal.rb | 17 ++++++++++
3 files changed, 64 insertions(+), 22 deletions(-)
marshal.c: don't call the proc with partially initialized objects.
(#4866)
For cyclic objects, it requires to keep a st_table of the partially
initialized objects.
---
marshal.c | 75 ++++++++++++++++++++---------------
spec/ruby/core/marshal/shared/load.rb | 75 ++++++++++++++++++++---------------
test/ruby/test_marshal.rb | 12 ++++++
3 files changed, 97 insertions(+), 65 deletions(-)
Diffstat (limited to 'include/ruby')
0 files changed, 0 insertions, 0 deletions