Commit 978805b2 authored by Michael Niedermayer's avatar Michael Niedermayer

Fix possible heap overflow caused by av_fast_realloc()

Originally committed as revision 12579 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cb6b4c98
......@@ -66,7 +66,11 @@ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size)
*size= FFMAX(17*min_size/16 + 32, min_size);
return av_realloc(ptr, *size);
ptr= av_realloc(ptr, *size);
if(!ptr) //we could set this to the unmodified min_size but this is safer if the user lost the ptr and uses NULL now
*size= 0;
return ptr;
}
static unsigned int last_static = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment