diff options
author | Peter Zhu <peter@peterzhu.ca> | 2021-11-23 13:14:45 -0500 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2021-11-24 23:01:41 +0900 |
commit | c51b92c18deb850d2cea3a7c9020db23b364ab72 (patch) | |
tree | bfb4de94ba8288545f6e2ef16c40a5daf1661be8 /test/zlib/test_zlib.rb | |
parent | 5445d33be2c6945ff335d5491a6666e8b544bf7b (diff) |
[ruby/zlib] [Bug #18358] Fix crash in zlib when in progress
When Zlib::Inflate#inflate or Zlib::Deflate#deflate is called
recursively inside the block, a crash can occur because of an
use-after-free bug.
https://github.com/ruby/zlib/commit/50fb8a0338
Diffstat (limited to 'test/zlib/test_zlib.rb')
-rw-r--r-- | test/zlib/test_zlib.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index a629c0c902..1e57c5aa8c 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -538,30 +538,36 @@ if defined? Zlib end def test_recursive_deflate + original_gc_stress = GC.stress + GC.stress = true zd = Zlib::Deflate.new s = SecureRandom.random_bytes(1024**2) - assert_raise(Zlib::BufError) do + assert_raise(Zlib::InProgressError) do zd.deflate(s) do zd.deflate(s) end end ensure + GC.stress = original_gc_stress zd&.finish zd&.close end def test_recursive_inflate + original_gc_stress = GC.stress + GC.stress = true zi = Zlib::Inflate.new s = Zlib.deflate(SecureRandom.random_bytes(1024**2)) - assert_raise(Zlib::DataError) do + assert_raise(Zlib::InProgressError) do zi.inflate(s) do zi.inflate(s) end end ensure + GC.stress = original_gc_stress zi&.close end end |