commit 8ebaf1ccf513e4460be4dc99260ee2ac7dc8ce88
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 11:43:11 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 11:43:11 2020 +0000
tree 87d8a9e4be84e309c9abdc29d1c78d4e1a22fe57
parent f817867cbbb14d13192c0d08b72049ef14226f16
parent 89f918f2809b1ec811e63f37484959a9432297a5

Merge "mp3dec: Zero initialize decoder memory during initialization" into rvc-dev am: f8b4f9a0e7 am: 89f918f280

Change-Id: I077f02c396ed951e0e029ea38ebf013c5c227b10

media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp

diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
index df6cd03..a5c7f5e 100644
--- a/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
+++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
@@ -659,20 +659,12 @@
     huffcodetab       *pHuff;
 
     pVars = (tmp3dec_file *)pMem;
-
-    pVars->num_channels = 0;
+    memset(pVars, 0, sizeof(*pVars));
 
     pExt->totalNumberOfBitsUsed = 0;
     pExt->inputBufferCurrentLength = 0;
     pExt->inputBufferUsedLength    = 0;
 
-    pVars->mainDataStream.offset = 0;
-
-    pv_memset((void*)pVars->mainDataBuffer,
-              0,
-              BUFSIZE*sizeof(*pVars->mainDataBuffer));
-
-
     pVars->inputStream.pBuffer = pExt->pInputBuffer;
 
     /*