diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2022-04-06 22:55:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 22:55:14 +0000 |
| commit | 2b57d2b0be28fd336085e8459ccef775c5bfca38 (patch) | |
| tree | 31d4c2de08f236f799e51486e9b07a13127357fc | |
| parent | ce38f5433995fa5f2190422d9db87c0db3178d46 (diff) | |
| parent | eb07c22519d94e573f2a02947094acd2219dc07a (diff) | |
| download | fdk-aac-2b57d2b0be28fd336085e8459ccef775c5bfca38.tar.gz fdk-aac-2b57d2b0be28fd336085e8459ccef775c5bfca38.tar.bz2 fdk-aac-2b57d2b0be28fd336085e8459ccef775c5bfca38.zip | |
Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048
Change-Id: I483ed144764b68840a5ee6463f1db927fe174ae7
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 506aed3..3603a77 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 - 2018 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) { |