summaryrefslogtreecommitdiff
path: root/libavcodec/roqvideodec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-06 09:15:19 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-08 08:11:35 +0100
commit3e2f200237af977b9253b0aff121eee27bcedb44 (patch)
tree73d63cefeaee192e7115bddd8988b30ca5c16a2a /libavcodec/roqvideodec.c
parent8a49d2bcbe7573bb4b765728b2578fac0d19763f (diff)
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
Diffstat (limited to 'libavcodec/roqvideodec.c')
-rw-r--r--libavcodec/roqvideodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index ef561a3210..39233be87c 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -44,7 +44,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);