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

avidec: avoid infinite loop due to negative ast->sample_size

Browse Source 
If max in clean_index is set to a negative ast->sample_size, the
following loop never ends:
        while (max < 1024)
            max += max;

Thus set ast->sample_size to 0 if it would otherwise be negative.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ca234639ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andreas Cadhalpun
2015-05-04 23:01:45 +02:00
committed by Michael Niedermayer
parent d8bfa4bb94
commit 84db3e6648
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/avidec.c
View File

@@ -686,6 +686,7 @@ static int avi_read_header(AVFormatContext *s)
default: default:
av_log(s, AV_LOG_INFO, "unknown stream type %X\n", tag1); av_log(s, AV_LOG_INFO, "unknown stream type %X\n", tag1);
} }
ast->sample_size = FFMAX(ast->sample_size, 0);
if (ast->sample_size == 0) { if (ast->sample_size == 0) {
st->duration = st->nb_frames; st->duration = st->nb_frames;
if (st->duration > 0 && avi->io_fsize > 0 && avi->riff_end > avi->io_fsize) { if (st->duration > 0 && avi->io_fsize > 0 && avi->riff_end > avi->io_fsize) {