- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / compress.c

diff --git a/compress.c b/compress.c
index 3badbf452da28c21c6f8f33a29c0b1f6d63b8bd8..c058d222412fba86df23cf7e679bf15533988cf7 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compress.c,v 1.25 2006/08/06 01:13:32 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,17 +13,22 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.17 2001/12/29 21:56:01 stevesk Exp $");
+
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <zlib.h>
 
 #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
@@ -54,17 +60,19 @@ buffer_compress_init_recv(void)
 void
 buffer_compress_uninit(void)
 {
-       debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
-           outgoing_stream.total_in, outgoing_stream.total_out,
+       debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
+           (unsigned long long)outgoing_stream.total_in,
+           (unsigned long long)outgoing_stream.total_out,
            outgoing_stream.total_in == 0 ? 0.0 :
            (double) outgoing_stream.total_out / outgoing_stream.total_in);
-       debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
-           incoming_stream.total_out, incoming_stream.total_in,
+       debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
+           (unsigned long long)incoming_stream.total_out,
+           (unsigned long long)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 +114,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 +158,7 @@ buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
                         */
                        return;
                default:
+                       inflate_failed = 1;
                        fatal("buffer_uncompress: inflate returned %d", status);
                        /* NOTREACHED */
                }