[FFmpeg-cvslog] tests/checkasm/nlmeans: fix invalid read/write on ii buffer

Clément Bœsch git at videolan.org
Fri May 18 20:16:38 EEST 2018


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri May 18 19:12:11 2018 +0200| [2940af9389e5cb2a7509655195e5ccb928577ed2] | committer: Clément Bœsch

tests/checkasm/nlmeans: fix invalid read/write on ii buffer

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2940af9389e5cb2a7509655195e5ccb928577ed2
---

 tests/checkasm/vf_nlmeans.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/checkasm/vf_nlmeans.c b/tests/checkasm/vf_nlmeans.c
index 5e2c934226..32c6931a4b 100644
--- a/tests/checkasm/vf_nlmeans.c
+++ b/tests/checkasm/vf_nlmeans.c
@@ -80,8 +80,8 @@ void checkasm_check_nlmeans(void)
                     av_assert0(startx_safe - s2x >= 0); av_assert0(startx_safe - s2x < w);
                     av_assert0(starty_safe - s2y >= 0); av_assert0(starty_safe - s2y < h);
 
-                    memset(ii_ref, 0, ii_lz_32 * ii_h * sizeof(*ii_ref));
-                    memset(ii_new, 0, ii_lz_32 * ii_h * sizeof(*ii_new));
+                    memset(ii_ref, 0, (ii_lz_32 * ii_h - 1) * sizeof(*ii_ref));
+                    memset(ii_new, 0, (ii_lz_32 * ii_h - 1) * sizeof(*ii_new));
 
                     call_ref(ii_ref + starty_safe*ii_lz_32 + startx_safe, ii_lz_32,
                              src + (starty_safe - s1y) * src_lz + (startx_safe - s1x), src_lz,
@@ -92,10 +92,10 @@ void checkasm_check_nlmeans(void)
                              src + (starty_safe - s2y) * src_lz + (startx_safe - s2x), src_lz,
                              safe_pw, safe_ph);
 
-                    if (memcmp(ii_ref, ii_new, ii_h * ii_lz_32 * 4))
+                    if (memcmp(ii_ref, ii_new, (ii_lz_32 * ii_h - 1) * sizeof(*ii_ref)))
                         fail();
 
-                    memset(ii_new, 0, ii_lz_32 * ii_h * sizeof(*ii_new));
+                    memset(ii_new, 0, (ii_lz_32 * ii_h - 1) * sizeof(*ii_new));
                     bench_new(ii_new + starty_safe*ii_lz_32 + startx_safe, ii_lz_32,
                              src + (starty_safe - s1y) * src_lz + (startx_safe - s1x), src_lz,
                              src + (starty_safe - s2y) * src_lz + (startx_safe - s2x), src_lz,



More information about the ffmpeg-cvslog mailing list