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

matroskadec: check headerstrip data availability.

Browse Source 
Fixes null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-17 17:12:22 +02:00
parent a80217a5ee
commit 2677697ac9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@ -1011,6 +1011,10 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
switch (encodings[0].compression.algo) { switch (encodings[0].compression.algo) {
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP:
if (encodings[0].compression.settings.size && !encodings[0].compression.settings.data) {
av_log(0, AV_LOG_ERROR, "Compression size but no data in headerstrip\n");
return -1;
}
return encodings[0].compression.settings.size; return encodings[0].compression.settings.size;
case MATROSKA_TRACK_ENCODING_COMP_LZO: case MATROSKA_TRACK_ENCODING_COMP_LZO:
do { do {