diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-18 02:53:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 15:32:44 +0100 |
| commit | bc07ec7b2f97377c84be046d4e5b057b39486a95 (patch) | |
| tree | aa3de82a43f0c75c8b2657bc1810adf12f50064a | |
| parent | 3a893335bde2d4ba2fcd839df09afb2b95779856 (diff) | |
| download | ffmpeg-bc07ec7b2f97377c84be046d4e5b057b39486a95.tar.gz | |
avcodec/snow: split block clipping checks
Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61d59703c91869f4e5cdacd8d6be52f8b89d4ba4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/snow.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 32f116d34d..f312c2cd18 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -309,7 +309,8 @@ static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer if(!sliced && !offset_dst) dst -= src_x; src_x=0; - }else if(src_x + b_w > w){ + } + if(src_x + b_w > w){ b_w = w - src_x; } if(src_y<0){ @@ -318,7 +319,8 @@ static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer if(!sliced && !offset_dst) dst -= src_y*dst_stride; src_y=0; - }else if(src_y + b_h> h){ + } + if(src_y + b_h> h){ b_h = h - src_y; } |