generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

probe_codec: fix memory corruption

Browse Source 
Found-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-26 01:05:01 +02:00
parent 6bf87785e8
commit 9054f6b66b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -680,11 +680,15 @@ static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt)
--st->probe_packets; --st->probe_packets;
if (pkt) { if (pkt) {
pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE); uint8_t *new_buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE);
if(!new_buf)
goto no_packet;
pd->buf = new_buf;
memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size); memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size);
pd->buf_size += pkt->size; pd->buf_size += pkt->size;
memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
} else { } else {
no_packet:
st->probe_packets = 0; st->probe_packets = 0;
} }