lavc/vvc: Fix buffer overread in CABAC

The size variable here is taken as gospel for the bounds of the input
buffer in later logic.  Clamp it to ensure that the returned region
does not extend past that allocated in the underlying GetBitContext,
even in the case entry point offsets are signalled in the bitstream.
Also assert this for good measure.

Signed-off-by: Frank Plowman <post@frankplowman.com>
release/7.1
Frank Plowman 11 months ago committed by Nuo Mi
parent f499503073
commit fcf74c5ebc
  1. 2
      libavcodec/vvc/dec.c

@ -497,9 +497,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, const int index,
skipped++;
}
size = end - start;
size = av_clip(size, 0, get_bits_left(gb) / 8);
} else {
size = get_bits_left(gb) / 8;
}
av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end);
ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size);
skip_bits(gb, size * 8);
}

Loading…
Cancel
Save