commit 556258af55d44a65bcce83a1a4353c22a7bbc190
author Alex Loiko <aleloi@webrtc.org> Tue Apr 09 09:22:07 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 09 11:53:13 2019
tree 82ece32000d90d2f319e0389173c9ca94053f61e
parent f4481c8f73439bf2c35003f2811c685aa72a254b

Fuzzer fix for multistream opus.

Fuzzer test was configured in a wrong way in
https://webrtc-review.googlesource.com/c/src/+/129768

This fixes it (verified locally on libfuzzer MSAN and ASAN).

Bug: webrtc:8649, chromium:950813
Change-Id: I52647bb12c4c412252cdcd931c9e210606bdb12d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132009
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27516}

test/fuzzers/audio_decoder_multistream_opus_fuzzer.cc

diff --git a/test/fuzzers/audio_decoder_multistream_opus_fuzzer.cc b/test/fuzzers/audio_decoder_multistream_opus_fuzzer.cc
index 7705773..474a1cd 100644
--- a/test/fuzzers/audio_decoder_multistream_opus_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_multistream_opus_fuzzer.cc
@@ -16,10 +16,12 @@
 
 AudioDecoderMultiChannelOpusConfig MakeDecoderConfig(
     int num_channels,
+    int num_streams,
     int coupled_streams,
     std::vector<unsigned char> channel_mapping) {
   AudioDecoderMultiChannelOpusConfig config;
   config.num_channels = num_channels;
+  config.num_streams = num_streams;
   config.coupled_streams = coupled_streams;
   config.channel_mapping = channel_mapping;
   return config;
@@ -27,22 +29,23 @@
 
 void FuzzOneInput(const uint8_t* data, size_t size) {
   const std::vector<AudioDecoderMultiChannelOpusConfig> surround_configs = {
-      MakeDecoderConfig(1, 0, {0}),  // Mono
+      MakeDecoderConfig(1, 1, 0, {0}),  // Mono
 
-      MakeDecoderConfig(2, 0, {0, 0}),  // Copy the first (of
-                                        // 2) decoded streams
-                                        // into both output
-                                        // channel 0 and output
-                                        // channel 1. Ignore
-                                        // the 2nd decoded
-                                        // stream.
+      MakeDecoderConfig(2, 2, 0, {0, 0}),  // Copy the first (of
+                                           // 2) decoded streams
+                                           // into both output
+                                           // channel 0 and output
+                                           // channel 1. Ignore
+                                           // the 2nd decoded
+                                           // stream.
 
-      MakeDecoderConfig(4, 2, {0, 1, 2, 3}),             // Quad.
-      MakeDecoderConfig(6, 2, {0, 4, 1, 2, 3, 5}),       // 5.1
-      MakeDecoderConfig(8, 3, {0, 6, 1, 2, 3, 4, 5, 7})  // 7.1
+      MakeDecoderConfig(4, 2, 2, {0, 1, 2, 3}),             // Quad.
+      MakeDecoderConfig(6, 4, 2, {0, 4, 1, 2, 3, 5}),       // 5.1
+      MakeDecoderConfig(8, 5, 3, {0, 6, 1, 2, 3, 4, 5, 7})  // 7.1
   };
 
   const auto config = surround_configs[data[0] % surround_configs.size()];
+  RTC_CHECK(config.IsOk());
   std::unique_ptr<AudioDecoder> dec =
       AudioDecoderMultiChannelOpus::MakeAudioDecoder(config);
   RTC_CHECK(dec);