29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 788f11ea6afeb96f0d84f140192165a1ca12ade4 Mon Sep 17 00:00:00 2001
|
|
From: Wayne Davison <wayne@opencoder.net>
|
|
Date: Sun, 7 Aug 2022 09:27:57 -0700
|
|
Subject: [PATCH] Fix zlib bug with a large gzip header extra field
|
|
|
|
From zlib commit eff308af425b67093bab25f80f1ae950166bece1.
|
|
Fixes CVE-2022-37434.
|
|
---
|
|
zlib/inflate.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/zlib/inflate.c b/zlib/inflate.c
|
|
index e43abd9e0..d15132eaf 100644
|
|
--- a/zlib/inflate.c
|
|
+++ b/zlib/inflate.c
|
|
@@ -739,9 +739,10 @@ int flush;
|
|
copy = state->length;
|
|
if (copy > have) copy = have;
|
|
if (copy) {
|
|
+ len = state->head->extra_len - state->length;
|
|
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_max) {
|
|
zmemcpy(state->head->extra + len, next,
|
|
len + copy > state->head->extra_max ?
|
|
state->head->extra_max - len : copy);
|