diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-01-05 05:03:19 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-01-05 05:03:19 +0000 |
| commit | 9cd61595ad6dfb22ff6fe4e86c9f9c6de6af4d23 (patch) | |
| tree | 839151e2482e971efb6bf88084a98f490f048da4 | |
| parent | e37c6dd2e0e877933dc771da347241f5c6507bb7 (diff) | |
| parent | b8b2479b4456ff06b3d5496818b836af1dc88818 (diff) | |
| download | angle-9cd61595ad6dfb22ff6fe4e86c9f9c6de6af4d23.tar.gz | |
[automerge] Fix a bug when getting a gzip header extra field with inflate(). 2p: b8b2479b44
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/angle/+/20874827
Change-Id: Ib576bb95ecb11ff01c3cc16cf9e3e0a66eb8ea5b
| -rw-r--r-- | third_party/zlib/contrib/optimizations/inflate.c | 5 | ||||
| -rw-r--r-- | third_party/zlib/inflate.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/third_party/zlib/contrib/optimizations/inflate.c b/third_party/zlib/contrib/optimizations/inflate.c index 81d558bd6e..93776ac579 100644 --- a/third_party/zlib/contrib/optimizations/inflate.c +++ b/third_party/zlib/contrib/optimizations/inflate.c @@ -771,8 +771,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); diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c index 68902e81bd..9057a574bb 100644 --- a/third_party/zlib/inflate.c +++ b/third_party/zlib/inflate.c @@ -760,8 +760,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); |