[FFmpeg-cvslog] avcodec/rv60: negative qp guard

Peter Ross git at videolan.org
Sat Nov 9 00:47:13 EET 2024


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Wed Nov  6 07:57:17 2024 +1100| [d51a920556cffe6e165b83fcc56d96be9c80e7be] | committer: Peter Ross

avcodec/rv60: negative qp guard

Fixes CID 1634472

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

 libavcodec/rv60dec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c
index d0cc10253b..d68fa66fa7 100644
--- a/libavcodec/rv60dec.c
+++ b/libavcodec/rv60dec.c
@@ -2270,6 +2270,8 @@ static int decode_slice(AVCodecContext *avctx, void *tdata, int cu_y, int thread
             ff_thread_progress_await(&s->progress[cu_y - 1], cu_x + 2);
 
         qp = s->qp + read_qp_offset(&gb, s->qp_off_type);
+        if (qp < 0)
+            return AVERROR_INVALIDDATA;
         sel_qp = calc_sel_qp(s->osvquant, qp);
 
         memset(thread.coded_blk, 0, sizeof(thread.coded_blk));



More information about the ffmpeg-cvslog mailing list