diff options
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-04-06 04:46:43 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-04-06 04:46:43 +0000 |
| commit | 9923d51ded4014f1172286da79f00af2b49a877e (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /libMpegTPDec/src | |
| parent | eafb6ae2028d9bb74ca07d2caf2621b0705fa202 (diff) | |
| parent | 9fb873a6ea73dce5011ba176d82e49b1c8f79604 (diff) | |
| download | fdk-aac-9923d51ded4014f1172286da79f00af2b49a877e.tar.gz fdk-aac-9923d51ded4014f1172286da79f00af2b49a877e.tar.bz2 fdk-aac-9923d51ded4014f1172286da79f00af2b49a877e.zip | |
[automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 067929dcd3 2p: 9fb873a6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043
Bug: 224314979
Bug: 221734266
Change-Id: Iff53639a3bc01005edd5775d7951c44a51cb4cac
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Diffstat (limited to 'libMpegTPDec/src')
| -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) { |