diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 23:46:44 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 23:46:44 +0300 |
| commit | bc976e5793004c9e4bdedf160852db9bc8b2dcaf (patch) | |
| tree | eff7d350aad84e332d6dd226f6851972d511c235 /libavcodec/utils.c | |
| parent | 9ea81fe95e63dc6295d6d9afc51c212022e01b2c (diff) | |
avcodec/utils: Fix potential overflow in overallocation code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4245b1a813..0910fca7e2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -127,7 +127,7 @@ static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, void **p = ptr; if (min_size <= *size && *p) return 0; - min_size = FFMAX(17 * min_size / 16 + 32, min_size); + min_size = FFMAX(min_size + min_size / 16 + 32, min_size); av_free(*p); *p = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); if (!*p) |