commit 353815e0d958c63adc3425df35baf61f097d2da2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jan 14 22:09:26 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jan 14 22:09:26 2023 +0000
tree 39b447b9a386f15fc981e24ad2df65f1d4828a23
parent 0eeadc6c44149dd2891eacdf33a942f29d0970cb
parent b93a9f24aa3f24ff8924e73b9d2ec964906c08a7

Snap for 9491515 from b93a9f24aa3f24ff8924e73b9d2ec964906c08a7 to tm-qpr3-release

Change-Id: I98d39a00fa515944faa61eb714b491a0e7c91cbe

third_party/zlib/contrib/optimizations/inflate.c

diff --git a/third_party/zlib/contrib/optimizations/inflate.c b/third_party/zlib/contrib/optimizations/inflate.c
index 4841cd9..bb223af 100644
--- a/third_party/zlib/contrib/optimizations/inflate.c
+++ b/third_party/zlib/contrib/optimizations/inflate.c
@@ -772,8 +772,9 @@
                 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);

third_party/zlib/inflate.c

diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c
index 7543c33..a9e2ddd 100644
--- a/third_party/zlib/inflate.c
+++ b/third_party/zlib/inflate.c
@@ -761,8 +761,9 @@
                 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);