summaryrefslogtreecommitdiff
path: root/zlib/inflate.c
diff options
context:
space:
mode:
authorWayne Davison <wayne@opencoder.net>2022-08-08 20:05:10 -0700
committerWayne Davison <wayne@opencoder.net>2022-08-08 20:05:10 -0700
commit9e2921fce8c518e370c324407d35bc83ba12f2d5 (patch)
tree1295a046a6de4df4295994168058af0e533d3772 /zlib/inflate.c
parent80d8f7c7cbb062f4ddab47eecb0a2253bb908a82 (diff)
downloadrsync-9e2921fce8c518e370c324407d35bc83ba12f2d5.tar.gz
A fix for the zlib fix.
Diffstat (limited to 'zlib/inflate.c')
-rw-r--r--zlib/inflate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/inflate.c b/zlib/inflate.c
index d15132ea..e9840b67 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -739,10 +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_max) {
+ (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);