From 9c3478c2343424907b0d8c88da917c56a4cd9162 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Wed, 12 Feb 2014 21:16:16 +0100 Subject: [PATCH] tools/uncoded_frame: fix double free in case av_interleaved_write_uncoded_frame fails it seems frame is freed for the second time in fail section. Signed-off-by: Lukasz Marek Reviewed-by: Nicolas George This commit also removes 1 trailing whitespace as otherwise the push hook rejects it Signed-off-by: Michael Niedermayer --- tools/uncoded_frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c index da04d06ea1..eafbbfde17 100644 --- a/tools/uncoded_frame.c +++ b/tools/uncoded_frame.c @@ -182,7 +182,7 @@ int main(int argc, char **argv) st->stream->codec->channel_layout = st->link->channel_layout; st->stream->codec->channels = avfilter_link_get_channels(st->link); st->stream->codec->sample_rate = st->link->sample_rate; - st->stream->codec->sample_fmt = st->link->format; + st->stream->codec->sample_fmt = st->link->format; break; default: av_assert0(!"reached"); @@ -245,12 +245,12 @@ int main(int argc, char **argv) ret = av_interleaved_write_uncoded_frame(st->mux, st->stream->index, frame); + frame = NULL; if (ret < 0) { av_log(st->stream->codec, AV_LOG_ERROR, "Error writing frame: %s\n", av_err2str(ret)); goto fail; } - frame = NULL; } } }