[FFmpeg-cvslog] swscale/x86/rgb2rgb: fix deinterleaveBytes writing past the end of the buffers
Ramiro Polla
git at videolan.org
Sat Sep 7 00:14:44 EEST 2024
ffmpeg | branch: master | Ramiro Polla <ramiro.polla at gmail.com> | Sun Sep 1 14:56:44 2024 +0200| [4c824ad391d543c3325ea3402a7d34d498b6e1f7] | committer: Ramiro Polla
swscale/x86/rgb2rgb: fix deinterleaveBytes writing past the end of the buffers
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c824ad391d543c3325ea3402a7d34d498b6e1f7
---
libswscale/x86/rgb2rgb.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
index 4d6ba9ff21..1617c33338 100644
--- a/libswscale/x86/rgb2rgb.c
+++ b/libswscale/x86/rgb2rgb.c
@@ -2380,7 +2380,12 @@ static void deinterleave_bytes_ ## cpuext(const uint8_t *src, uint8_t *dst1, uin
int dst1Stride, int dst2Stride) \
{ \
for (int h = 0; h < height; h++) { \
- ff_nv12ToUV_ ## cpuext(dst1, dst2, NULL, src, NULL, width, NULL, NULL); \
+ if (width >= 16) \
+ ff_nv12ToUV_ ## cpuext(dst1, dst2, NULL, src, NULL, width - 15, NULL, NULL); \
+ for (int w = (width & (~15)); w < width; w++) { \
+ dst1[w] = src[2*w+0]; \
+ dst2[w] = src[2*w+1]; \
+ } \
src += srcStride; \
dst1 += dst1Stride; \
dst2 += dst2Stride; \
More information about the ffmpeg-cvslog
mailing list