upstream: when decompressing zlib compressed packets, use

Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
specified as a valid mode for inflate(). There should be no practical change
in behaviour as the compression side ensures a flush that should make all
data available to the receiver in all cases.

repoted by lamm AT ibm.com via bz3372; ok markus

OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b

diff --git a/packet.c b/packet.c
index 248fb9bd0a349cb48b02a67ac537215729e83c5d..d81d01a1c36a11a8fea858b36aaff889c28bb234 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.304 2022/01/01 01:55:30 jsg Exp $ */
+/* $OpenBSD: packet.c,v 1.305 2022/01/17 22:56:04 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -794,7 +794,7 @@ uncompress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out)
                ssh->state->compression_in_stream.avail_out = sizeof(buf);
 
                status = inflate(&ssh->state->compression_in_stream,
-                   Z_PARTIAL_FLUSH);
+                   Z_SYNC_FLUSH);
                switch (status) {
                case Z_OK:
                        if ((r = sshbuf_put(out, buf, sizeof(buf) -