diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2022-04-05 18:53:20 +0200 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2022-04-06 05:04:55 +0000 |
| commit | b297bcbf2a2950cce6dad473f236949a0003769c (patch) | |
| tree | 34b42a72382ed04d7dfd80c54e8a56f136c30920 | |
| parent | 8ad12f29d89bc7972ffc5edd5d961c249ac8bca8 (diff) | |
| download | fdk-aac-b297bcbf2a2950cce6dad473f236949a0003769c.tar.gz fdk-aac-b297bcbf2a2950cce6dad473f236949a0003769c.tar.bz2 fdk-aac-b297bcbf2a2950cce6dad473f236949a0003769c.zip | |
Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648
Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
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 ca35184..a4c0521 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) { |