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

lavfi: avfilter_merge_formats: handle case where inputs are same

Browse Source 
This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Mina Nagy Zaki 2011-06-08 19:24:25 +03:00 committed by Anton Khirnov
parent 828bd088f3
commit 11b6a82412
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/formats.c
View File

@ -45,6 +45,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
AVFilterFormats *ret; AVFilterFormats *ret;
unsigned i, j, k = 0, m_count; unsigned i, j, k = 0, m_count;
if (a == b)
return a;
ret = av_mallocz(sizeof(*ret)); ret = av_mallocz(sizeof(*ret));
/* merge list of formats */ /* merge list of formats */