diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-06 09:15:19 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-03-09 18:01:09 +0100 |
| commit | 747fbe0c212b81952bb27ec7b99fa709081e2d63 (patch) | |
| tree | db14fee3373a6e1cb25db657a44c3c8ad7b36db6 /libavcodec | |
| parent | d3b40af01f88aeb19f3400956fefa0e324ef5e2e (diff) | |
| download | ffmpeg-747fbe0c212b81952bb27ec7b99fa709081e2d63.tar.gz | |
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
When there is just 1 byte remanining in the buffer, nothing will be read
and the loop will continue forever. Check that there are at least 8
bytes, which are always read at the beginning.
CC:libav-stable@libav.org
(cherry picked from commit 3e2f200237af977b9253b0aff121eee27bcedb44)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/roqvideodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 3ee62c01b5..d156a843ba 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -43,7 +43,7 @@ static void roqvideo_decode_frame(RoqContext *ri) roq_qcell *qcell; int64_t chunk_start; - while (bytestream2_get_bytes_left(&ri->gb) > 0) { + while (bytestream2_get_bytes_left(&ri->gb) >= 8) { chunk_id = bytestream2_get_le16(&ri->gb); chunk_size = bytestream2_get_le32(&ri->gb); chunk_arg = bytestream2_get_le16(&ri->gb); |