highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/aviobuf: fix null dereference in avio_close_dyn_buf()

Browse Source 
Fixes CID1135769

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-11 16:16:04 +01:00
parent 0fe6906d96
commit 7441d1ec33
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/aviobuf.c
View File

@ -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) int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
{ {
DynBuffer *d = s->opaque; DynBuffer *d;
int size; int size;
static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0}; static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0};
int padding = 0; int padding = 0;
@ -1045,6 +1045,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
*pbuffer = NULL; *pbuffer = NULL;
return 0; return 0;
} }
d = s->opaque;
/* don't attempt to pad fixed-size packet buffers */ /* don't attempt to pad fixed-size packet buffers */
if (!s->max_packet_size) { if (!s->max_packet_size) {