forked from pool/ffmpeg-6
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
|
From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1
|
||
|
|
Author: Michael Niedermayer <michael@niedermayer.cc>
|
||
|
|
Date: Mon Apr 8 18:38:42 2024 +0200
|
||
|
|
Subject: avcodec/mpegvideo_enc: Fix 1 line and one column images
|
||
|
|
References: CVE-2024-32230
|
||
|
|
References: bsc#1227296
|
||
|
|
Upstream: Backport from upstream
|
||
|
|
|
||
|
|
Fixes: Ticket10952
|
||
|
|
Fixes: poc21ffmpeg
|
||
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
||
|
|
|
||
|
|
--- ffmpeg-6.1.1/libavcodec/mpegvideo_enc.c 2023-12-31 08:07:26.000000000 +0800
|
||
|
|
+++ ffmpeg-6.1.1_new/libavcodec/mpegvideo_enc.c 2024-07-05 18:08:49.827035281 +0800
|
||
|
|
@@ -1198,8 +1198,8 @@
|
||
|
|
int dst_stride = i ? s->uvlinesize : s->linesize;
|
||
|
|
int h_shift = i ? s->chroma_x_shift : 0;
|
||
|
|
int v_shift = i ? s->chroma_y_shift : 0;
|
||
|
|
- int w = s->width >> h_shift;
|
||
|
|
- int h = s->height >> v_shift;
|
||
|
|
+ int w = AV_CEIL_RSHIFT(s->width , h_shift);
|
||
|
|
+ int h = AV_CEIL_RSHIFT(s->height, v_shift);
|
||
|
|
const uint8_t *src = pic_arg->data[i];
|
||
|
|
uint8_t *dst = pic->f->data[i];
|
||
|
|
int vpad = 16;
|