| Message ID | 20240409075544.7985-1-post@frankplowman.com |
|---|---|
| State | Accepted |
| Commit | 2b7e79e8905bc9dc0ee9c9a9e313f38c31de4b0a |
| Headers | show |
| Series | [FFmpeg-devel] lavc/vvc: Avoid overflow in coeff scale intermediate | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index e515fb9710..5ac7d02c80 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -416,7 +416,7 @@ static const uint8_t* derive_scale_m(const VVCLocalContext *lc, const TransformB static av_always_inline int scale_coeff(const TransformBlock *tb, int coeff, const int scale, const int scale_m, const int log2_transform_range) { - coeff = (coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift; + coeff = ((int64_t) coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift; coeff = av_clip_intp2(coeff, log2_transform_range); return coeff; }
Make intermediate result 64-bits to avoid an overflow before the right shift. Signed-off-by: Frank Plowman <post@frankplowman.com> --- libavcodec/vvc/intra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)