diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-05-04 23:01:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:11 +0200 |
| commit | 4d27d864a653c47b76da2ad994799e994720dbf6 (patch) | |
| tree | 83cca49705756755abe0ab05bd710249530223c4 | |
| parent | 35eabb85b2a68ea5620c5cbd21fb478291bc7b51 (diff) | |
| download | ffmpeg-4d27d864a653c47b76da2ad994799e994720dbf6.tar.gz | |
avidec: avoid infinite loop due to negative ast->sample_size
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 ca234639ac49a0dc073ac1f10977979acdb94f97)
Conflicts:
libavformat/avidec.c
| -rw-r--r-- | libavformat/avidec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 87a5e7cf00..1d5e3bafb3 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -571,6 +571,7 @@ static int avi_read_header(AVFormatContext *s) default: 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) { st->duration = st->nb_frames; if (st->duration > 0 && avi->io_fsize > 0 && avi->riff_end > avi->io_fsize) { |