commit bc07ec7b2f97377c84be046d4e5b057b39486a95
author Michael Niedermayer <michaelni@gmx.at> Tue Feb 18 02:53:14 2014 +0100
committer Michael Niedermayer <michaelni@gmx.at> Sat Mar 08 15:32:44 2014 +0100
tree aa3de82a43f0c75c8b2657bc1810adf12f50064a
parent 3a893335bde2d4ba2fcd839df09afb2b95779856

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>

libavcodec/snow.h

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index 32f116d..f312c2c 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -309,7 +309,8 @@
         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 @@
         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;
     }