diff options
author | James Almer <jamrial@gmail.com> | 2017-10-30 22:08:14 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-30 22:08:14 +0300 |
commit | 4959f18a8e11ad7d3529b1c4fc429f1b6b76ad7c (patch) | |
tree | 9154851bfccf366ea5fd13b9de33dfd9ecc22cd3 /libavutil/mem.c | |
parent | f9c3fbc00cd6c8887e0e66cec275ade881130adf (diff) | |
parent | 04b0f0e371ff81b682274b574fb465ba4395c09f (diff) |
Merge commit '04b0f0e371ff81b682274b574fb465ba4395c09f'
* commit '04b0f0e371ff81b682274b574fb465ba4395c09f':
mem: uninline av_malloc(z)_array()
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/mem.c')
-rw-r--r-- | libavutil/mem.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index 36740f1154..6ad409daf4 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -181,6 +181,20 @@ int av_reallocp(void *ptr, size_t size) return 0; } +void *av_malloc_array(size_t nmemb, size_t size) +{ + if (!size || nmemb >= INT_MAX / size) + return NULL; + return av_malloc(nmemb * size); +} + +void *av_mallocz_array(size_t nmemb, size_t size) +{ + if (!size || nmemb >= INT_MAX / size) + return NULL; + return av_mallocz(nmemb * size); +} + void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) |