Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavu/mem: Allow allocations close to max_alloc_size with av_fast_realloc().

Browse source
This commit is contained in:
Carl Eugen Hoyos 2018-01-02 01:58:35 +01:00
parent f141b353e6
commit 695b1d8111
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavutil/mem.c
View file

@ -466,7 +466,12 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
if (min_size <= *size) if (min_size <= *size)
return ptr; return ptr;
min_size = FFMAX(min_size + min_size / 16 + 32, min_size); if (min_size > max_alloc_size - 32) {
*size = 0;
return NULL;
}
min_size = FFMIN(max_alloc_size - 32, FFMAX(min_size + min_size / 16 + 32, min_size));
ptr = av_realloc(ptr, min_size); ptr = av_realloc(ptr, min_size);
/* we could set this to the unmodified min_size but this is safer /* we could set this to the unmodified min_size but this is safer