[FFmpeg-cvslog] avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb()

Michael Niedermayer git at videolan.org
Wed Jul 24 17:49:51 EEST 2024


ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul  5 02:21:46 2024 +0200| [1fa6ad547432e2bcc7efc37fc4810d041cc37764] | committer: Michael Niedermayer

avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb()

Found by code review related to CID1604563 Overflowed return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit b2aaeb81f65aaa61238d74a77034b118055340d3)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fa6ad547432e2bcc7efc37fc4810d041cc37764
---

 libavcodec/golomb.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 0750b3c55c..4161c35258 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -402,6 +402,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
     log = av_log2(buf);
 
     if (log > 31 - limit) {
+        av_assert2(log >= k);
         buf >>= log - k;
         buf  += (30U - log) << k;
         LAST_SKIP_BITS(re, gb, 32 + k - log);



More information about the ffmpeg-cvslog mailing list