diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2022-04-06 20:52:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 20:52:06 +0000 |
| commit | 8cadcc08e40601061c4d257a4d3593e52161cdaf (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | 671c4c80fe5aff65341db2173f32fc411e8dc158 (diff) | |
| parent | 83f9450b438c4c02e30b39d5f8594baf0db6ff65 (diff) | |
| download | fdk-aac-8cadcc08e40601061c4d257a4d3593e52161cdaf.tar.gz fdk-aac-8cadcc08e40601061c4d257a4d3593e52161cdaf.tar.bz2 fdk-aac-8cadcc08e40601061c4d257a4d3593e52161cdaf.zip | |
Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 067929dcd3 am: 83f9450b43
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043
Change-Id: I0d627e2a8f8a11f1736aaa45e70bd2b8ceef9d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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) { |