diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
| commit | dce7b34b9f70d28161082e6187c5cb6ea4079060 (patch) | |
| tree | b3b63b028dfc4e4853f71339390eea6fb3f6cc24 /tools/plink/sshzlib.c | |
| parent | 6ba4c534507676abe7d7ac415cb113cd40953925 (diff) | |
| parent | 6039fd0faf73c9d6c5b2abf9d824734218ec5eee (diff) | |
| download | vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.gz vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.bz2 vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/sshbn.c
Diffstat (limited to 'tools/plink/sshzlib.c')
| -rw-r--r-- | tools/plink/sshzlib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/plink/sshzlib.c b/tools/plink/sshzlib.c index 7d37141c7..9c780a41f 100644 --- a/tools/plink/sshzlib.c +++ b/tools/plink/sshzlib.c @@ -1259,6 +1259,8 @@ int zlib_decompress_block(void *handle, unsigned char *block, int len, goto finished;
nlen = dctx->bits & 0xFFFF;
EATBITS(16);
+ if (dctx->uncomplen != (nlen ^ 0xFFFF))
+ goto decode_error;
if (dctx->uncomplen == 0)
dctx->state = OUTSIDEBLK; /* block is empty */
else
@@ -1369,6 +1371,7 @@ int main(int argc, char **argv) const struct ssh_compress ssh_zlib = {
"zlib",
+ "zlib@openssh.com", /* delayed version */
zlib_compress_init,
zlib_compress_cleanup,
zlib_compress_block,
|