diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2022-04-06 04:44:54 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-04-06 04:44:54 +0000 |
| commit | d787bdd639ad53af8d1f0736be9d071fe5bda633 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /libMpegTPDec | |
| parent | 891e8c1f3aa896d37eb4c0eb623bcbf237940eeb (diff) | |
| parent | 2768a078f34a4d6cdb05916ad0e1f02d4c73fb6b (diff) | |
| download | fdk-aac-d787bdd639ad53af8d1f0736be9d071fe5bda633.tar.gz fdk-aac-d787bdd639ad53af8d1f0736be9d071fe5bda633.tar.bz2 fdk-aac-d787bdd639ad53af8d1f0736be9d071fe5bda633.zip | |
[automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615051
Bug: 224314979
Bug: 221734266
Change-Id: Id377e9ed3e293572c9f6feadbabdaa7ac66e0a6e
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Diffstat (limited to 'libMpegTPDec')
| -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) { |