From fc962d4e7a7c3d799d9364d5427564c22ee3880c Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 3 Jun 2013 12:31:46 +0300 Subject: mem: Add av_realloc_array and av_reallocp_array MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These help avoiding overflows and simplify error handling. Signed-off-by: Martin Storsjö --- libavutil/mem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'libavutil/mem.c') diff --git a/libavutil/mem.c b/libavutil/mem.c index 391eb7db38..e901533cc7 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -136,6 +136,32 @@ void *av_realloc(void *ptr, size_t size) #endif } +void *av_realloc_array(void *ptr, size_t nmemb, size_t size) +{ + if (size <= 0 || nmemb >= INT_MAX / size) + return NULL; + return av_realloc(ptr, nmemb * size); +} + +int av_reallocp_array(void *ptr, size_t nmemb, size_t size) +{ + void **ptrptr = ptr; + void *ret; + if (size <= 0 || nmemb >= INT_MAX / size) + return AVERROR(ENOMEM); + if (nmemb <= 0) { + av_freep(ptr); + return 0; + } + ret = av_realloc(*ptrptr, nmemb * size); + if (!ret) { + av_freep(ptr); + return AVERROR(ENOMEM); + } + *ptrptr = ret; + return 0; +} + void av_free(void *ptr) { #if CONFIG_MEMALIGN_HACK -- cgit v1.2.3