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>
This commit is contained in:
Fraunhofer IIS FDK 2022-04-06 20:52:06 +00:00 committed by Automerger Merge Worker
commit 8cadcc08e4
1 changed files with 7 additions and 1 deletions

View File

@ -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) {