commit cbac9982e2dbf03f430eb23cdbc274927cd56be2
author Kris Alder <kalder@google.com> Thu Jul 23 16:15:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 23 16:15:16 2020 +0000
tree 212511ab6ae4c3d33821f8235cbc8e29c5dcfbee
parent 98a36dee8ee933b4e9287994b8a321d4f166328c
parent b0c4c1d24b66f57aef024e6f528f42df4ea62c3a

Merge "Added fuzz_config field in vorbis_dec_fuzzer"

fuzzer/vorbis_dec_fuzzer.cpp

diff --git a/fuzzer/vorbis_dec_fuzzer.cpp b/fuzzer/vorbis_dec_fuzzer.cpp
index 3fe717d..5c0e4c9 100644
--- a/fuzzer/vorbis_dec_fuzzer.cpp
+++ b/fuzzer/vorbis_dec_fuzzer.cpp
@@ -94,6 +94,8 @@
         /* skip kVorbisHeaderlength <type + "vorbis"> bytes */
         makeBitReader(data + kVorbisHeaderlength, size - kVorbisHeaderlength, &buf, &ref, &bits);
         if (data[0] == 1) {
+          // release any memory that vorbis_info_init will blindly overwrite
+          vorbis_info_clear(mVi);
           vorbis_info_init(mVi);
           if (0 != _vorbis_unpack_info(mVi, &bits)) {
             return;
@@ -106,6 +108,8 @@
           if (0 != _vorbis_unpack_books(mVi, &bits)) {
             return;
           }
+          // release any memory that vorbis_dsp_init will blindly overwrite
+          vorbis_dsp_clear(mState);
           if (0 != vorbis_dsp_init(mState, mVi)) {
             return;
           }