Module: libav
Branch: master
Commit: 11b6a82412bcd372adf694a26d83b07d337e1325
Author: Mina Nagy Zaki <mnz...@gmail.com>
Committer: Anton Khirnov <an...@khirnov.net>
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 <an...@khirnov.net>
---
libavfilter/formats.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 9d048d7..206eff5 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(*ret));
/* merge list of formats */
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
