From 6b38f75b24a40c8675c378aaed3792b4be784404 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 15 Jan 2016 23:27:00 +0100 Subject: [PATCH] Fix an instance of undefined integer behavior. Found by the Clang static analyzer. --- h264encode.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/h264encode.cpp b/h264encode.cpp index 02ada02..c7fdeac 100644 --- a/h264encode.cpp +++ b/h264encode.cpp @@ -293,7 +293,11 @@ bitstream_put_ui(bitstream *bs, unsigned int val, int size_in_bits) bs->buffer[pos] = (bs->buffer[pos] << size_in_bits | val); } else { size_in_bits -= bit_left; - bs->buffer[pos] = (bs->buffer[pos] << bit_left) | (val >> size_in_bits); + if (bit_left >= 32) { + bs->buffer[pos] = (val >> size_in_bits); + } else { + bs->buffer[pos] = (bs->buffer[pos] << bit_left) | (val >> size_in_bits); + } bs->buffer[pos] = va_swap32(bs->buffer[pos]); if (pos + 1 == bs->max_size_in_dword) { -- 2.39.2