generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing checks in avfilter_default_get_video_buffer().

Browse Source 
Originally committed as revision 24809 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-08-17 15:12:28 +00:00
parent 4f9ce3c4c7
commit 65d4cab562
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/defaults.c
View File

@@ -35,9 +35,12 @@ static void avfilter_default_free_buffer(AVFilterBuffer *ptr)
AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, int w, int h) AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
{ {
AVFilterBuffer *pic = av_mallocz(sizeof(AVFilterBuffer)); AVFilterBuffer *pic = av_mallocz(sizeof(AVFilterBuffer));
AVFilterBufferRef *ref = av_mallocz(sizeof(AVFilterBufferRef)); AVFilterBufferRef *ref = NULL;
int i, tempsize; int i, tempsize;
char *buf; char *buf = NULL;
if (!pic || !(ref = av_mallocz(sizeof(AVFilterBufferRef))))
goto fail;
ref->buf = pic; ref->buf = pic;
ref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps)); ref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps));
@@ -58,12 +61,22 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int per
tempsize = av_fill_image_pointers(pic->data, ref->format, ref->video->h, NULL, pic->linesize); tempsize = av_fill_image_pointers(pic->data, ref->format, ref->video->h, NULL, pic->linesize);
buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be
// SIMD-friendly // SIMD-friendly
if (!buf)
goto fail;
av_fill_image_pointers(pic->data, ref->format, ref->video->h, buf, pic->linesize); av_fill_image_pointers(pic->data, ref->format, ref->video->h, buf, pic->linesize);
memcpy(ref->data, pic->data, sizeof(ref->data)); memcpy(ref->data, pic->data, sizeof(ref->data));
memcpy(ref->linesize, pic->linesize, sizeof(ref->linesize)); memcpy(ref->linesize, pic->linesize, sizeof(ref->linesize));
return ref; return ref;
fail:
av_free(buf);
if (ref && ref->video)
av_free(ref->video);
av_free(ref);
av_free(pic);
return NULL;
} }
void avfilter_default_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) void avfilter_default_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)