roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
authorAnton Khirnov <anton@khirnov.net>
Wed, 6 Mar 2013 08:15:19 +0000 (09:15 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sat, 16 Mar 2013 07:21:01 +0000 (08:21 +0100)
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>
(cherry picked from commit 747fbe0c212b81952bb27ec7b99fa709081e2d63)

Conflicts:

libavcodec/roqvideodec.c

libavcodec/roqvideodec.c

index 0bf00cf..fe7863f 100644 (file)
@@ -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);