commit 7b96a9670726b359ac06ebf29607deaf7137e626
author Andrey Norkin <anorkin@netflix.com> Fri Jul 13 11:00:15 2018 -0700
committer Urvang Joshi <urvang@google.com> Fri Jul 13 21:25:16 2018 +0000
tree 5a4014fb47ff1c139704997702e55093bbc8ec4c
parent d74f568ead5be57f8aabf3b3320b085718ac52a1

film grain: set luma grain to 0 when num_y_point is zero

Avoids overflow when tested with sanitizer
Non-normative since overflown values were not used

BUG=aomedia:2018
BUG=oss-fuzz:9376

Change-Id: I366416d6b53412c4e8f7a880757276cc274edeb7

aom_dsp/grain_synthesis.c

diff --git a/aom_dsp/grain_synthesis.c b/aom_dsp/grain_synthesis.c
index 2e716f8..ff1ec41 100644
--- a/aom_dsp/grain_synthesis.c
+++ b/aom_dsp/grain_synthesis.c
@@ -400,7 +400,11 @@
     const aom_film_grain_t *params, int **pred_pos_luma, int *luma_grain_block,
     int luma_block_size_y, int luma_block_size_x, int luma_grain_stride,
     int left_pad, int top_pad, int right_pad, int bottom_pad) {
-  if (params->num_y_points == 0) return;
+  if (params->num_y_points == 0) {
+    memset(luma_grain_block, 0,
+           sizeof(*luma_grain_block) * luma_block_size_y * luma_grain_stride);
+    return;
+  }
 
   int bit_depth = params->bit_depth;
   int gauss_sec_shift = 12 - bit_depth + params->grain_scale_shift;