summaryrefslogtreecommitdiff
path: root/libavcodec/get_bits.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-01-15 10:21:36 +0100
committerAnton Khirnov <anton@khirnov.net>2023-01-18 09:41:32 +0100
commit0b33310cd02aa8e33b2fc1613d13cadb83bb7da8 (patch)
treee9e519a2f28dd04a7d69f8927a91193257eeabda /libavcodec/get_bits.h
parentbf23d530d25370819792378d72979a137e6527b9 (diff)
downloadffmpeg-0b33310cd02aa8e33b2fc1613d13cadb83bb7da8.tar.gz
lavc/bitstream: avoid UB in bits_{read,peek}_signed(0)
bits_*_signed(0) will currently invoke an undefined shift by 8 * sizeof(int). Add bits_*_signed_nz() that only works for n>0, analogous to bits_read_nz(). Add an explicit check for n=0 in bits_*_signed(). Found-by: James Almer
Diffstat (limited to 'libavcodec/get_bits.h')
-rw-r--r--libavcodec/get_bits.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 1aa327a4ac..65dc080ddb 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -85,7 +85,7 @@ typedef BitstreamContext GetBitContext;
#define get_bits1 bits_read_bit
#define get_bits64 bits_read_64
#define get_xbits bits_read_xbits
-#define get_sbits bits_read_signed
+#define get_sbits bits_read_signed_nz
#define get_sbits_long bits_read_signed
#define show_bits bits_peek
#define show_bits_long bits_peek