virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases 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.
This commit is contained in:
Mina Nagy Zaki
2011-06-08 19:24:25 +03:00
committed by Stefano Sabatini
parent 989184fea4
commit 79a0ec1af4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/formats.c
View File

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