eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/videodsp_template: Fix overflow of addition

Browse Source 
Fixes: addition of unsigned offset to 0x7f56fc26a9b6 overflowed to 0x7f56fc26a8be*
Fixes: clusterfuzz-testcase-minimized-mediasource_MP4_AVC1_pipeline_integration_fuzzer-4917949056679936

Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 247a1de7f7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-06-15 00:47:06 +02:00
parent 55fca6e6e5
commit f1400191c6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/videodsp_template.c
View File

@@ -44,7 +44,8 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
src_y = 1 - block_h; src_y = 1 - block_h;
} }
if (src_x >= w) { if (src_x >= w) {
src += (w - 1 - src_x) * sizeof(pixel); // The subtracted expression has an unsigned type and must thus not be negative
src -= (1 + src_x - w) * sizeof(pixel);
src_x = w - 1; src_x = w - 1;
} else if (src_x <= -block_w) { } else if (src_x <= -block_w) {
src += (1 - block_w - src_x) * sizeof(pixel); src += (1 - block_w - src_x) * sizeof(pixel);