From c983ca5b90b80feb65a82678253340992cb54040 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 3 Jun 2012 03:44:16 +0200 Subject: [PATCH] mpegtsenc: zero pointers after freeing Signed-off-by: Michael Niedermayer --- libavformat/mpegtsenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 9e066dede6..1df804472c 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -723,9 +723,10 @@ static int mpegts_write_header(AVFormatContext *s) if (ts_st) { av_freep(&ts_st->payload); if (ts_st->amux) { - av_free(ts_st->amux->pb->buffer); - av_free(ts_st->amux->pb); + av_freep(&ts_st->amux->pb->buffer); + av_freep(&ts_st->amux->pb); avformat_free_context(ts_st->amux); + ts_st->amux = NULL; } } av_freep(&st->priv_data); @@ -1235,9 +1236,10 @@ static int mpegts_write_end(AVFormatContext *s) MpegTSWriteStream *ts_st = st->priv_data; av_freep(&ts_st->payload); if (ts_st->amux) { - av_free(ts_st->amux->pb->buffer); - av_free(ts_st->amux->pb); + av_freep(&ts_st->amux->pb->buffer); + av_freep(&ts_st->amux->pb); avformat_free_context(ts_st->amux); + ts_st->amux = NULL; } }