diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-11-13 16:10:38 +0100 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2020-01-23 12:24:56 -0800 |
| commit | f04a8a855cf8ddb5996c8e191fd3fa15b3808657 (patch) | |
| tree | e4bd2c8d1c13085e3c2babcfeb39ea867a3f596e /libMpegTPDec/src/tpdec_lib.cpp | |
| parent | 262c9f28ec50e2ebbd2cdd64bd82831d957cf420 (diff) | |
| download | fdk-aac-f04a8a855cf8ddb5996c8e191fd3fa15b3808657.tar.gz fdk-aac-f04a8a855cf8ddb5996c8e191fd3fa15b3808657.tar.bz2 fdk-aac-f04a8a855cf8ddb5996c8e191fd3fa15b3808657.zip | |
Do not allow channel configuration change within PCE for ADTS. Fixes assert.
Bug: 146938557
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Icba99bd0eeba1f94298bdd08b85f1b0cb3cf241b
Diffstat (limited to 'libMpegTPDec/src/tpdec_lib.cpp')
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp index 7bebbaa..ca35184 100644 --- a/libMpegTPDec/src/tpdec_lib.cpp +++ b/libMpegTPDec/src/tpdec_lib.cpp @@ -929,6 +929,11 @@ static TRANSPORTDEC_ERROR transportDec_readHeader( } } } + /* if an error is detected terminate config parsing to avoid that an + * invalid config is accepted in the second pass */ + if (err != TRANSPORTDEC_OK) { + break; + } } } else { /* Reset CRC because the next bits are the beginning of a |