Merge "mp3dec: Zero initialize decoder memory during initialization" into rvc-dev

4 years ago · f8b4f9a0e7
parent 6e89a07046 2cb9d98d41
commit f8b4f9a0e7
1 changed files with 1 additions and 9 deletions
--- a/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
+++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
@ -659,20 +659,12 @@ void pvmp3_InitDecoder(tPVMP3DecoderExternal *pExt,
    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;

    /*