From 7441d1ec330da810a0ffd44a02b2fc60add5b719 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 11 Dec 2013 16:16:04 +0100 Subject: avformat/aviobuf: fix null dereference in avio_close_dyn_buf() Fixes CID1135769 Signed-off-by: Michael Niedermayer --- libavformat/aviobuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 8b4511d177..eb5a6e502d 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1036,7 +1036,7 @@ int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) { - DynBuffer *d = s->opaque; + DynBuffer *d; int size; static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0}; int padding = 0; @@ -1045,6 +1045,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) *pbuffer = NULL; return 0; } + d = s->opaque; /* don't attempt to pad fixed-size packet buffers */ if (!s->max_packet_size) { -- cgit v1.2.3