diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2017-11-30 Arjun Shankar <arjun@redhat.com> + + [BZ #22375] + * malloc/malloc.c (__libc_malloc): Use checked_request2size + instead of request2size. + 2017-11-30 Joseph Myers <joseph@codesourcery.com> * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S diff --git a/malloc/malloc.c b/malloc/malloc.c index 79f0e9e..0c9e074 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3031,7 +3031,8 @@ __libc_malloc (size_t bytes) return (*hook)(bytes, RETURN_ADDRESS (0)); #if USE_TCACHE /* int_free also calls request2size, be careful to not pad twice. */ - size_t tbytes = request2size (bytes); + size_t tbytes; + checked_request2size (bytes, tbytes); size_t tc_idx = csize2tidx (tbytes); MAYBE_INIT_TCACHE (); |