Zip_Flush(): close the connection in all error cases.

[ngircd-alex.git] / src / ngircd / conn-zip.c

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index 040d9f0a630b117345440c78ae47a6c13b0808a8..f162d2bc90e9a1ac3b72ed3854d4dae39b490360 100644 (file)
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -22,7 +22,7 @@
 /* enable more zlib related debug messages: */
 /* #define DEBUG_ZLIB */
 
-static char UNUSED id[] = "$Id: conn-zip.c,v 1.13 2007/05/17 13:49:49 alex Exp $";
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.15 2007/05/17 15:16:47 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -122,14 +122,13 @@ Zip_Flush( CONN_ID Idx )
 
        out = &My_Connections[Idx].zip.out;
 
-       out->next_in = array_start(&My_Connections[Idx].zip.wbuf);
-       if (!out->next_in)
-               return false;
-
        out->avail_in = (uInt)array_bytes(&My_Connections[Idx].zip.wbuf);
        if (!out->avail_in)
                return true;    /* nothing to do. */
 
+       out->next_in = array_start(&My_Connections[Idx].zip.wbuf);
+       assert(out->next_in != NULL);
+
        out->next_out = zipbuf;
        out->avail_out = (uInt)sizeof zipbuf;
 
@@ -160,8 +159,11 @@ Zip_Flush( CONN_ID Idx )
        Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
 #endif
        if (!array_catb(&My_Connections[Idx].wbuf,
-                       (char *)zipbuf, (size_t) zipbuf_used))
+                       (char *)zipbuf, (size_t) zipbuf_used)) {
+               Log (LOG_ALERT, "Compression error: can't copy data!?");
+               Conn_Close(Idx, "Compression error!", NULL, false);
                return false;
+       }
 
        My_Connections[Idx].bytes_out += zipbuf_used;
        My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf); 
@@ -193,10 +195,9 @@ Unzip_Buffer( CONN_ID Idx )
                return true;
 
        in = &My_Connections[Idx].zip.in;
-       
+
        in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
-       if (!in->next_in)
-               return false;
+       assert(in->next_in != NULL);
 
        in->avail_in = z_rdatalen;
        in->next_out = unzipbuf;