diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 00:35:16 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 00:36:45 +0300 |
commit | f8db81074a9674e3b0c7e71cca0aa90755b7f8fc (patch) | |
tree | 57cce54f7bc34273f691d16e830a5d8e48db0486 /libavcodec/utils.c | |
parent | 59a07df0673122b334af1f26367f6a49a0ec121b (diff) |
avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b086665478..fb5a72f14f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -127,8 +127,10 @@ static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, void *val; memcpy(&val, ptr, sizeof(val)); - if (min_size <= *size && val) + if (min_size <= *size) { + av_assert0(val || !min_size); return 0; + } min_size = FFMAX(min_size + min_size / 16 + 32, min_size); av_freep(ptr); val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); |