mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 19:59:06 +08:00
143bc76cc7
* [zlib] Fix CVE-2022-37434 * [zlib] Merge actual patch * Update ports/zlib/CVE-2022-37434.patch Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * [zlib] Update version SHA Co-authored-by: Chris Brammer <brammer@extend3d.de> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
18 lines
819 B
Diff
18 lines
819 B
Diff
diff --git a/inflate.c b/inflate.c
|
|
index 7be8c6366..7a7289749 100644
|
|
--- a/inflate.c
|
|
+++ b/inflate.c
|
|
@@ -763,9 +763,10 @@ int flush;
|
|
copy = state->length;
|
|
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);
|