commit dedce44ca873ceb1e4269c7427177da7a3110b8c
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Sat Dec 29 06:26:08 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sat Dec 29 06:26:08 2018 -0800
tree d029489868f9b3560d2589ceb528b400b603685b
parent a556a32eaebefc94025cf67e211385828881d7d9
parent 0ef6247c4f898e9259872d3565a604d7bebbf36d

Merge "Clear spatial specific config struct at the beginning of parse routines" am: 0142f38904
am: 0ef6247c4f

Change-Id: I4e11c35bb3e4c20f2844bcec8912f15139fa185f

libSACdec/src/sac_bitdec.cpp

diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp
index 45fb17a..159cf84 100644
--- a/libSACdec/src/sac_bitdec.cpp
+++ b/libSACdec/src/sac_bitdec.cpp
@@ -325,6 +325,8 @@
     INT coreSbrFrameLengthIndex) {
   int i;
 
+  FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
+
   pSpatialSpecificConfig->stereoConfigIndex = stereoConfigIndex;
   pSpatialSpecificConfig->coreSbrFrameLengthIndex = coreSbrFrameLengthIndex;
   pSpatialSpecificConfig->freqRes =
@@ -447,6 +449,8 @@
   int numHeaderBits;
   int cfgStartPos, bitsAvailable;
 
+  FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
+
   cfgStartPos = FDKgetValidBits(bitstream);
   /* It might be that we do not know the SSC length beforehand. */
   if (sacHeaderLen == 0) {