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 /libavformat/rtpenc_jpeg.c | |
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
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions