[FFmpeg-cvslog] segment: fix null pointer dereference
Paul B Mahol
git at videolan.org
Thu Mar 22 14:03:31 CET 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Mar 22 03:36:25 2012 +0000| [4246032216181c778f7ddf7f2e062cada2ef346d] | committer: Michael Niedermayer
segment: fix null pointer dereference
Signed-off-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4246032216181c778f7ddf7f2e062cada2ef346d
---
libavformat/segment.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 1af412a..05f76a7 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -174,11 +174,13 @@ static int seg_write_header(AVFormatContext *s)
fail:
if (ret) {
- oc->streams = NULL;
- oc->nb_streams = 0;
+ if (oc) {
+ oc->streams = NULL;
+ oc->nb_streams = 0;
+ avformat_free_context(oc);
+ }
if (seg->list)
avio_close(seg->pb);
- avformat_free_context(oc);
}
return ret;
}
More information about the ffmpeg-cvslog
mailing list