Commit c6ae0565 authored by takis's avatar takis

Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,

mbardiaux mediaxim dot be.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7794 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 607a10af
......@@ -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