commit ec329eec9da896408fe8c65c304d3a10c72754dc
author Angie Chiang <angiebird@google.com> Mon Aug 14 18:27:26 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Aug 15 15:54:41 2017 +0000
tree a1d05c846485f4ef260e54fd5f38077db705c61d
parent 57486c5f09fdc685dfed14580911a8c33fb91b75

Fix integer overflow in warp filter test

The overflow happens because the buffer used by convolve_round
is not properly initialized.

BUG=aomedia:686

Change-Id: I6173fb1899eeda78adafde773b3f36312467b47f

test/warp_filter_test_util.cc

diff --git a/test/warp_filter_test_util.cc b/test/warp_filter_test_util.cc
index 71945c3..6962c78 100644
--- a/test/warp_filter_test_util.cc
+++ b/test/warp_filter_test_util.cc
@@ -116,12 +116,6 @@
 #if CONFIG_CONVOLVE_ROUND
   int32_t *dsta = new int32_t[output_n];
   int32_t *dstb = new int32_t[output_n];
-  // Prepare two copies of the destination
-  for (j = 0; j < out_w * out_h; ++j) {
-    int32_t v = rnd_.Rand16();
-    dsta[j] = v;
-    dstb[j] = v;
-  }
 #endif
 
   // Generate an input block and extend its borders horizontally
@@ -141,6 +135,12 @@
         generate_model(mat, &alpha, &beta, &gamma, &delta);
 #if CONFIG_CONVOLVE_ROUND
         if (use_no_round) {
+          // Prepare two copies of the destination
+          for (j = 0; j < out_w * out_h; ++j) {
+            int32_t v = rnd_.Rand16();
+            dsta[j] = v;
+            dstb[j] = v;
+          }
           conv_params = get_conv_params_no_round(0, 0, 0, dsta, out_w);
         } else {
           conv_params = get_conv_params(0, 0, 0);
@@ -296,12 +296,6 @@
 #if CONFIG_CONVOLVE_ROUND
   int32_t *dsta = new int32_t[output_n];
   int32_t *dstb = new int32_t[output_n];
-  // Prepare two copies of the destination
-  for (j = 0; j < out_w * out_h; ++j) {
-    int32_t v = rnd_.Rand16();
-    dsta[j] = v;
-    dstb[j] = v;
-  }
 #endif
   // Generate an input block and extend its borders horizontally
   for (i = 0; i < h; ++i)
@@ -322,6 +316,12 @@
         generate_model(mat, &alpha, &beta, &gamma, &delta);
 #if CONFIG_CONVOLVE_ROUND
         if (use_no_round) {
+          // Prepare two copies of the destination
+          for (j = 0; j < out_w * out_h; ++j) {
+            int32_t v = rnd_.Rand16();
+            dsta[j] = v;
+            dstb[j] = v;
+          }
           conv_params = get_conv_params_no_round(0, 0, 0, dsta, out_w);
         } else {
           conv_params = get_conv_params(0, 0, 0);
@@ -332,6 +332,8 @@
                                  &conv_params, alpha, beta, gamma, delta);
 #if CONFIG_CONVOLVE_ROUND
         if (use_no_round) {
+          // TODO(angiebird): Change this to test_impl once we have SIMD
+          // implementation
           conv_params = get_conv_params_no_round(0, 0, 0, dstb, out_w);
         }
 #endif