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 2421e10737b03e4c3cf740012e5c7f5b7c8c0557..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.11 2006/07/23 15:19:20 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>
@@ -85,32 +85,36 @@ Zip_InitConn( CONN_ID Idx )
 GLOBAL bool
 Zip_Buffer( CONN_ID Idx, char *Data, size_t Len )
 {
-       /* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
-       * Es wird true bei Erfolg, sonst false geliefert. */
+       size_t buflen;
 
        assert( Idx > NONE );
        assert( Data != NULL );
        assert( Len > 0 );
-       assert( Len <= ZWRITEBUFFER_LEN );
 
-       if (Len > ZWRITEBUFFER_LEN)
-               return false;
-
-       if ( array_bytes( &My_Connections[Idx].zip.wbuf ) >= ZWRITEBUFFER_LEN ) {
+       buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
+       if (buflen >= WRITEBUFFER_LEN) {
                /* compression buffer is full, flush */
                if( ! Zip_Flush( Idx )) return false;
        }
 
+       /* check again; if zip buf is still too large do not append data:
+        * otherwise the zip wbuf would grow too large */
+       buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
+       if (buflen >= WRITEBUFFER_LEN)
+               return false;
        return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
 } /* Zip_Buffer */
 
 
+/**
+ * Compress data in ZIP buffer and move result to the write buffer of
+ * the connection.
+ * @param Idx Connection handle.
+ * @retrun true on success, false otherwise.
+ */
 GLOBAL bool
 Zip_Flush( CONN_ID Idx )
 {
-       /* Daten komprimieren und in Schreibpuffer kopieren.
-       * Es wird true bei Erfolg, sonst false geliefert. */
-
        int result;
        unsigned char zipbuf[WRITEBUFFER_LEN];
        int zipbuf_used = 0;
@@ -118,11 +122,12 @@ 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;
@@ -139,14 +144,26 @@ Zip_Flush( CONN_ID Idx )
                return false;
        }
 
+       if (out->avail_out <= 0) {
+               /* Not all data was compressed, because data became
+                * bigger while compressing it. */
+               Log (LOG_ALERT, "Compression error: buffer overvlow!?");
+               Conn_Close(Idx, "Compression error!", NULL, false);
+               return false;
+       }
+
        assert(out->avail_out <= WRITEBUFFER_LEN);
+
        zipbuf_used = WRITEBUFFER_LEN - out->avail_out;
 #ifdef DEBUG_ZIP
        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); 
@@ -178,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;