LGTM On Mon, Aug 19, 2019 at 3:08 PM Jun Zhao <[email protected]> wrote:
> From: Jun Zhao <[email protected]> > > 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 <[email protected]> > --- > 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 > > _______________________________________________ > ffmpeg-devel mailing list > [email protected] > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > [email protected] with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
