videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavfi/avfiltergraph: add check before free the format 

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

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao 2019-08-19 13:22:34 +08:00
parent df6876d691
commit f156f4ab23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfiltergraph.c
View File

@ -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;