Commit 79f64f7e authored by Luca Barbato's avatar Luca Barbato

bitstream: Avoid undefined behavior in bitstream_skip()

Do not use skip_remaining() to fully wipe the cache, as this could do
a 64-bit shift of a 64-bit variable which is undefined behavior in C.
Instead set the related variables to zero directly.

Thanks to Uoti for pointing out the problem.

CC: libav-stable@libav.org
parent fd92dafa
......@@ -239,11 +239,13 @@ static inline void skip_remaining(BitstreamContext *bc, unsigned n)
/* Skip n bits in the buffer. */
static inline void bitstream_skip(BitstreamContext *bc, unsigned n)
{
if (n <= bc->bits_left)
if (n < bc->bits_left)
skip_remaining(bc, n);
else {
n -= bc->bits_left;
skip_remaining(bc, bc->bits_left);
bc->bits = 0;
bc->bits_left = 0;
if (n >= 64) {
unsigned skip = n / 8;
......
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