From: Derek Buitenhuis Date: Tue, 22 Oct 2013 18:40:05 +0000 (+0100) Subject: avfiltergraph: Properly handle memory allocation failure X-Git-Tag: n2.1~26 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=52aed19307ee0768b03a620005c4b2b5fda621c6 avfiltergraph: Properly handle memory allocation failure Signed-off-by: Derek Buitenhuis --- diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 2db2900ea8..506d79ec71 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -392,6 +392,19 @@ static int can_merge_formats(AVFilterFormats *a_arg, return 1; a = clone_filter_formats(a_arg); b = clone_filter_formats(b_arg); + + if (!a || !b) { + if (a) + av_freep(&a->formats); + if (b) + av_freep(&b->formats); + + av_freep(&a); + av_freep(&b); + + return 0; + } + if (is_sample_rate) { ret = ff_merge_samplerates(a, b); } else {