diff options
| author | des <des@FreeBSD.org> | 2002-06-23 14:01:54 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-23 14:01:54 +0000 |
| commit | 610201f50fdb0594e9885594b69e4ee69c71dd08 (patch) | |
| tree | b7e89b45c0327694bc87ec94464fd0a685e1ef1d /crypto/openssh/compress.c | |
| parent | f58c4e7f5e1985bae7ed77fb0e8b2766eb4824e9 (diff) | |
| download | FreeBSD-src-610201f50fdb0594e9885594b69e4ee69c71dd08.zip FreeBSD-src-610201f50fdb0594e9885594b69e4ee69c71dd08.tar.gz | |
Vendor import of OpenSSH 3.3.
Diffstat (limited to 'crypto/openssh/compress.c')
| -rw-r--r-- | crypto/openssh/compress.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crypto/openssh/compress.c b/crypto/openssh/compress.c index 3badbf4..85a361d 100644 --- a/crypto/openssh/compress.c +++ b/crypto/openssh/compress.c @@ -12,17 +12,19 @@ */ #include "includes.h" -RCSID("$OpenBSD: compress.c,v 1.17 2001/12/29 21:56:01 stevesk Exp $"); +RCSID("$OpenBSD: compress.c,v 1.19 2002/03/18 17:31:54 provos Exp $"); #include "log.h" #include "buffer.h" #include "zlib.h" #include "compress.h" -static z_stream incoming_stream; -static z_stream outgoing_stream; +z_stream incoming_stream; +z_stream outgoing_stream; static int compress_init_send_called = 0; static int compress_init_recv_called = 0; +static int inflate_failed = 0; +static int deflate_failed = 0; /* * Initializes compression; level is compression level from 1 to 9 @@ -62,9 +64,9 @@ buffer_compress_uninit(void) incoming_stream.total_out, incoming_stream.total_in, incoming_stream.total_out == 0 ? 0.0 : (double) incoming_stream.total_in / incoming_stream.total_out); - if (compress_init_recv_called == 1) + if (compress_init_recv_called == 1 && inflate_failed == 0) inflateEnd(&incoming_stream); - if (compress_init_send_called == 1) + if (compress_init_send_called == 1 && deflate_failed == 0) deflateEnd(&outgoing_stream); } @@ -106,6 +108,7 @@ buffer_compress(Buffer * input_buffer, Buffer * output_buffer) sizeof(buf) - outgoing_stream.avail_out); break; default: + deflate_failed = 1; fatal("buffer_compress: deflate returned %d", status); /* NOTREACHED */ } @@ -149,6 +152,7 @@ buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer) */ return; default: + inflate_failed = 1; fatal("buffer_uncompress: inflate returned %d", status); /* NOTREACHED */ } |
