[FFmpeg-cvslog] avcodec/rv60dec: Use get_bits_long()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Dec  8 01:58:20 2024 +0100| [2336fc44acc15b9f2e8f6dcef1651f90d15c9cd9] | committer: Michael Niedermayer

avcodec/rv60dec: Use get_bits_long()

Fixes: 378634700/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV60_fuzzer-5008344043028480
Fixes: assertion failure

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/rv60dec.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c
index 449650223d..4cc71dcd6e 100644
--- a/libavcodec/rv60dec.c
+++ b/libavcodec/rv60dec.c
@@ -395,10 +395,13 @@ static int read_slice_sizes(RV60Context *s, GetBitContext *gb)
     for (int i = 0; i < s->cu_height; i++)
         s->slice[i].sign = get_bits1(gb);
 
-    s->slice[0].size = last_size = sum = get_bits(gb, nbits);
+    s->slice[0].size = last_size = sum = get_bits_long(gb, nbits);
+
+    if (sum < 0)
+        return AVERROR_INVALIDDATA;
 
     for (int i = 1; i < s->cu_height; i++) {
-        int diff = get_bits(gb, nbits);
+        int diff = get_bits_long(gb, nbits);
         if (s->slice[i].sign)
             last_size += diff;
         else