generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-07-11 23:35:16 +02:00
parent 59a07df067
commit f8db81074a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@@ -127,8 +127,10 @@ static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size,
void *val; void *val;
memcpy(&val, ptr, sizeof(val)); memcpy(&val, ptr, sizeof(val));
if (min_size <= *size && val) if (min_size <= *size) {
av_assert0(val || !min_size);
return 0; return 0;
}
min_size = FFMAX(min_size + min_size / 16 + 32, min_size); min_size = FFMAX(min_size + min_size / 16 + 32, min_size);
av_freep(ptr); av_freep(ptr);
val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size);