mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 14:42:13 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From e40800a613eb89b5b4c701774c3cecc1c2b7dd6c Mon Sep 17 00:00:00 2001
|
|
From: Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>
|
|
Date: Tue, 5 Apr 2022 18:53:20 +0200
|
|
Subject: [PATCH] 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
|
|
(cherry picked from commit eb07c22519d94e573f2a02947094acd2219dc07a)
|
|
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
|
|
---
|
|
libMpegTPDec/src/tpdec_lib.cpp | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
|
|
index 1d8b7b3..c2dc964 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) {
|