mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-27 08:29:31 -05: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>
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Sadaf Ebrahimi <sadafebrahimi@google.com>
|
|
Date: Tue, 22 Nov 2022 22:00:13 +0000
|
|
Subject: [PATCH] Fix a bug when getting a gzip header extra field with
|
|
inflate().
|
|
|
|
If the extra field was larger than the space the user provided with
|
|
inflateGetHeader(), and if multiple calls of inflate() delivered
|
|
the extra header data, then there could be a buffer overflow of the
|
|
provided space. This commit assures that provided space is not
|
|
exceeded.
|
|
|
|
Bug: http://b/242299736
|
|
Test: TreeHugger
|
|
|
|
Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
|
|
(cherry picked from commit 1c4806afd7ae034aa9f86df35d4341a0b175a90a)
|
|
Merged-In: I4eabb3e135c1568e06b2b9740651a3ae11b21140
|
|
---
|
|
src/inflate.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/inflate.c b/src/inflate.c
|
|
index ac333e8..cd01857 100644
|
|
--- a/src/inflate.c
|
|
+++ b/src/inflate.c
|
|
@@ -759,8 +759,9 @@ int flush;
|
|
if (copy > have) copy = have;
|
|
if (copy) {
|
|
if (state->head != Z_NULL &&
|
|
- state->head->extra != Z_NULL) {
|
|
- len = state->head->extra_len - state->length;
|
|
+ state->head->extra != Z_NULL &&
|
|
+ (len = state->head->extra_len - state->length) <
|
|
+ state->head->extra_max) {
|
|
zmemcpy(state->head->extra + len, next,
|
|
len + copy > state->head->extra_max ?
|
|
state->head->extra_max - len : copy);
|