Commit 65d999d6 authored by Michel Bardiaux's avatar Michel Bardiaux Committed by Panagiotis Issaris

Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,

mbardiaux mediaxim dot be.

Originally committed as revision 7794 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 54118497
......@@ -237,8 +237,14 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
InternalBuffer *buf;
int *picture_number;
assert(pic->data[0]==NULL);
assert(INTERNAL_BUFFER_SIZE > s->internal_buffer_count);
if(pic->data[0]!=NULL) {
av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n");
return -1;
}
if(s->internal_buffer_count >= INTERNAL_BUFFER_SIZE) {
av_log(s, AV_LOG_ERROR, "internal_buffer_count overflow (missing release_buffer?)\n");
return -1;
}
if(avcodec_check_dimensions(s,w,h))
return -1;
......
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