Browse Source

lavu/mem: Do not realloc in av_fast_realloc() if size == min_size.

This can avoid OOM for min_size close to FFmpeg's arbitrary alloc limits.
tags/n4.0
Carl Eugen Hoyos 7 years ago
parent
commit
21b5990da4
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavutil/mem.c

+ 1
- 1
libavutil/mem.c View File

@@ -463,7 +463,7 @@ void av_memcpy_backptr(uint8_t *dst, int back, int cnt)


void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) 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); min_size = FFMAX(min_size + min_size / 16 + 32, min_size);


Loading…
Cancel
Save