[FFmpeg-devel] [PATCH V1 2/5] lavfi/avfiltergraph: add check before free the format

Jun Zhao mypopydev at gmail.com
Mon Aug 19 16:01:04 EEST 2019


From: Jun Zhao <barryjzhao at tencent.com>

ff_merge_samplerates will be deallocate a or b in some case, so
add a check before free the format.

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
---
 libavfilter/avfiltergraph.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index a149f8f..2fe4f0b 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -419,8 +419,10 @@ static int can_merge_formats(AVFilterFormats *a_arg,
         av_freep(&ret);
         return 1;
     } else {
-        av_freep(&a->formats);
-        av_freep(&b->formats);
+        if (a)
+            av_freep(&a->formats);
+        if (b)
+            av_freep(&b->formats);
         av_freep(&a);
         av_freep(&b);
         return 0;
-- 
1.7.1



More information about the ffmpeg-devel mailing list