diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Sep 17 16:22:58 2014 Eric Wong <e@80x24.org> + + * ext/zlib/zlib.c (zlib_mem_alloc): check overflow + Wed Sep 17 11:33:35 2014 Laurent Arnoud <laurent@spkdev.net> * test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof): diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 223879c2dc..af45b6f884 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -584,7 +584,7 @@ struct zstream_run_args { static voidpf zlib_mem_alloc(voidpf opaque, uInt items, uInt size) { - voidpf p = xmalloc(items * size); + voidpf p = xmalloc2(items, size); /* zlib FAQ: Valgrind (or some similar memory access checker) says that deflate is performing a conditional jump that depends on an uninitialized value. Isn't that a bug? |