fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 067929dcd3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Bug: 224314979
Bug: 221734266
Change-Id: I69b28b6fc5e23e4023d89815e61e6778631105b7
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
This commit is contained in:
Presubmit Automerger Backend 2022-04-06 04:46:35 +00:00
parent 7ad4d71f15 067929dcd3
commit 9fb873a6ea
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libMpegTPDec/src/tpdec_lib.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 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) { if (err == TRANSPORTDEC_OK && fConfigFound) {