Commit 67317767 authored by Jindřich Makovička's avatar Jindřich Makovička Committed by Reinhard Tartler

h264: avoid stuck buffer pointer in decode_nal_units

When decode_nal_units() previously encountered a NAL_END_SEQUENCE,
and there are some junk bytes left in the input buffer, but no start codes,
buf_index gets stuck 3 bytes before the end of the buffer.

This can trigger an infinite loop in the caller code, eg. in
try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes,
with 3 bytes of the input packet still available.

With this change, the remaining bytes are skipped so the whole packet gets
consumed.

CC:libav-stable@libav.org
Signed-off-by: 's avatarJindřich Makovička <makovick@gmail.com>
Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
(cherry picked from commit 1a8c6917)

Conflicts:

	libavcodec/h264.c
parent d4e42341
......@@ -7456,7 +7456,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
break;
}
if(buf_index+3 >= buf_size) break;
if (buf_index + 3 >= buf_size) {
buf_index = buf_size;
break;
}
buf_index+=3;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment