Module: libav Branch: release/0.8 Commit: e5f4e249422834f727bcd432b73af971277f1371
Author: Mina Nagy Zaki <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Wed Jun 8 19:24:25 2011 +0300 lavfi: avfilter_merge_formats: handle case where inputs are same 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 <[email protected]> (cherry picked from commit 11b6a82412bcd372adf694a26d83b07d337e1325) Conflicts: libavfilter/formats.c Signed-off-by: Reinhard Tartler <[email protected]> --- libavfilter/formats.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 8c5041a..7eca639 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -45,6 +45,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) AVFilterFormats *ret; unsigned i, j, k = 0, m_count; + if (a == b) + return a; + ret = av_mallocz(sizeof(AVFilterFormats)); /* merge list of formats */ _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
