diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2022-04-06 05:06:03 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-04-06 05:06:03 +0000 |
| commit | b70aa8fe3455e4258a8c6526ff924cc12d610204 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | 671c4c80fe5aff65341db2173f32fc411e8dc158 (diff) | |
| parent | 50d66655caffd198c482e434ea7c631d9b83e632 (diff) | |
| download | fdk-aac-b70aa8fe3455e4258a8c6526ff924cc12d610204.tar.gz fdk-aac-b70aa8fe3455e4258a8c6526ff924cc12d610204.tar.bz2 fdk-aac-b70aa8fe3455e4258a8c6526ff924cc12d610204.zip | |
[automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057
Bug: 224314979
Bug: 221734266
Change-Id: I41a977f7513be7f6df072011524a4870ac08dfab
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
| -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) { |