diff options
| author | Xin Li <delphij@google.com> | 2022-06-14 16:48:08 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-06-14 16:48:08 -0700 |
| commit | 0ace73f2d33102b47a98cb4741a402d267844472 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | 3070cab376bd2a4b86df798d1f11dff0aef48b61 (diff) | |
| parent | 1f830f7196b0b0171f786bc4ab56a90bcbea43f9 (diff) | |
| download | fdk-aac-0ace73f2d33102b47a98cb4741a402d267844472.tar.gz fdk-aac-0ace73f2d33102b47a98cb4741a402d267844472.tar.bz2 fdk-aac-0ace73f2d33102b47a98cb4741a402d267844472.zip | |
Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I4df938df7886adc58185586190e27bcd16e17966
Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp index 091d011..8cd9cb0 100644 --- a/libMpegTPDec/src/tpdec_lib.cpp +++ b/libMpegTPDec/src/tpdec_lib.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -351,6 +351,12 @@ TRANSPORTDEC_ERROR transportDec_OutOfBandConfig(HANDLE_TRANSPORTDEC hTp, } } } + + /* 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; + } } if (err == TRANSPORTDEC_OK && fConfigFound) { |