From 4970670c78efdf64048874c3bd34b3ebca7e65e7 Mon Sep 17 00:00:00 2001 From: Henrik Lundin Date: Thu, 17 Oct 2019 10:37:42 +0200 Subject: [PATCH] Avoid reading outside of memory in WebRtcVad_FindMinimum Also, change test target from rtc_static_library to rtc_source_set so that it is actually linked and run. Bug: webrtc:11010, webrtc:11037 Change-Id: I05173718ee7de8a9fad73b62c0efd0da4d4f1a7e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157166 Commit-Queue: Henrik Lundin Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#29509} --- common_audio/vad/vad_sp.c | 2 +- modules/audio_processing/vad/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common_audio/vad/vad_sp.c b/common_audio/vad/vad_sp.c index d367c8b0af..d710a37907 100644 --- a/common_audio/vad/vad_sp.c +++ b/common_audio/vad/vad_sp.c @@ -79,7 +79,7 @@ int16_t WebRtcVad_FindMinimum(VadInstT* self, age[i]++; } else { // Too old value. Remove from memory and shift larger values downwards. - for (j = i; j < 16; j++) { + for (j = i; j < 15; j++) { smallest_values[j] = smallest_values[j + 1]; age[j] = age[j + 1]; } diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn index bf99115c82..8eb59c91df 100644 --- a/modules/audio_processing/vad/BUILD.gn +++ b/modules/audio_processing/vad/BUILD.gn @@ -45,7 +45,7 @@ rtc_static_library("vad") { } if (rtc_include_tests) { - rtc_static_library("vad_unittests") { + rtc_source_set("vad_unittests") { testonly = true sources = [ "gmm_unittest.cc",