aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2024-12-08 01:58:20 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2024-12-24 02:55:18 +0100
commit2336fc44acc15b9f2e8f6dcef1651f90d15c9cd9 (patch)
treede73106265c89e0877f1c982bddae5b287c3bf0f
parent34c06f52849a51c58a11ae530bd4c30012a3d6a0 (diff)
downloadffmpeg-2336fc44acc15b9f2e8f6dcef1651f90d15c9cd9.tar.gz
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@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/rv60dec.c7
1 files 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