[FFmpeg-cvslog] lavc/vvc: Clamp shift RHS

Frank Plowman git at videolan.org
Fri Jan 26 20:50:00 EET 2024


ffmpeg | branch: master | Frank Plowman <post at frankplowman.com> | Fri Jan 26 09:13:13 2024 +0000| [763e31a8d3e3def53fc22828e75df54127e9487e] | committer: James Almer

lavc/vvc: Clamp shift RHS

Resolves the following undefined behavior sanitiser error:
runtime error: shift exponent 32 is too large for 32-bit type 'int'

Signed-off-by: Frank Plowman <post at frankplowman.com>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/vvc/vvc_intra_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vvc/vvc_intra_template.c b/libavcodec/vvc/vvc_intra_template.c
index 9fb47549d5..a078885266 100644
--- a/libavcodec/vvc/vvc_intra_template.c
+++ b/libavcodec/vvc/vvc_intra_template.c
@@ -969,7 +969,7 @@ static void FUNC(pred_angular_h)(uint8_t *_src, const uint8_t *_top, const uint8
         int pos = (1 + ref_idx) * intra_pred_angle;
         int wt;
         if (need_pdpc)
-            wt = (32 >> ((y * 2) >> nscale));
+            wt = (32 >> FFMIN(31, (y * 2) >> nscale));
 
         for (int x = 0; x < w; x++) {
             const int idx  = (pos >> 5) + ref_idx;



More information about the ffmpeg-cvslog mailing list