diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 23:36:03 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 23:49:04 +0400 |
commit | 3fcc2684e49bbaa5a92a768f7649584e1d982f9f (patch) | |
tree | 637248bf8c8017a0fddc366d1faef37a2f9f670f | |
parent | d2db1bb7dea19551e4604067d0acbd9e2950c698 (diff) | |
parent | b284e1ffe343d6697fb950d1ee517bafda8a9844 (diff) |
Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'
* commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844':
mem: do not check for negative size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavutil/mem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h index b73b72435b..77b7adc373 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -92,7 +92,7 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); */ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size) { - if (size <= 0 || nmemb >= INT_MAX / size) + if (!size || nmemb >= INT_MAX / size) return NULL; return av_malloc(nmemb * size); } @@ -227,7 +227,7 @@ void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; */ av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size) { - if (size <= 0 || nmemb >= INT_MAX / size) + if (!size || nmemb >= INT_MAX / size) return NULL; return av_mallocz(nmemb * size); } |