fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Clear config in case of parsing error in drcDec_readUniDrc()"

This commit is contained in:
Jean-Michel Trivi 2019-03-14 22:08:07 +00:00 committed by Android (Google) Code Review
parent 358e6d14ac c2e0dfe237
commit 041424440a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libDRCdec/src/drcDec_reader.cpp
View File

@ -185,10 +185,18 @@ drcDec_readUniDrc(HANDLE_FDK_BITSTREAM hBs, HANDLE_UNI_DRC_CONFIG hUniDrcConfig,
uniDrcConfigPresent = FDKreadBits(hBs, 1); uniDrcConfigPresent = FDKreadBits(hBs, 1);
if (uniDrcConfigPresent) { if (uniDrcConfigPresent) {
err = drcDec_readUniDrcConfig(hBs, hUniDrcConfig); err = drcDec_readUniDrcConfig(hBs, hUniDrcConfig);
if (err) return err; if (err) {
/* clear config, if parsing error occured */
FDKmemclear(hUniDrcConfig, sizeof(UNI_DRC_CONFIG));
hUniDrcConfig->diff = 1;
}
} }
err = drcDec_readLoudnessInfoSet(hBs, hLoudnessInfoSet); err = drcDec_readLoudnessInfoSet(hBs, hLoudnessInfoSet);
if (err) return err; if (err) {
/* clear config, if parsing error occured */
FDKmemclear(hLoudnessInfoSet, sizeof(LOUDNESS_INFO_SET));
hLoudnessInfoSet->diff = 1;
}
} }
if (hUniDrcGain != NULL) { if (hUniDrcGain != NULL) {