You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
avcodec/h261dec: make while get_bits loop more robust by checking bits left
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -125,8 +125,11 @@ static int h261_decode_gob_header(H261Context *h)
|
||||
}
|
||||
|
||||
/* GEI */
|
||||
while (get_bits1(&s->gb) != 0)
|
||||
while (get_bits1(&s->gb) != 0) {
|
||||
skip_bits(&s->gb, 8);
|
||||
if (get_bits_left(&s->gb) <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (s->qscale == 0) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n");
|
||||
@@ -505,8 +508,11 @@ static int h261_decode_picture_header(H261Context *h)
|
||||
skip_bits1(&s->gb); /* Reserved */
|
||||
|
||||
/* PEI */
|
||||
while (get_bits1(&s->gb) != 0)
|
||||
while (get_bits1(&s->gb) != 0) {
|
||||
skip_bits(&s->gb, 8);
|
||||
if (get_bits_left(&s->gb) <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
/* H.261 has no I-frames, but if we pass AV_PICTURE_TYPE_I for the first
|
||||
* frame, the codec crashes if it does not contain all I-blocks
|
||||
|
Reference in New Issue
Block a user