]> arthur.barton.de Git - ngircd-alex.git/commitdiff
array_start() cannot legally return NULL if array_length() > 0 --> use assert().
authorFlorian Westphal <fw@strlen.de>
Thu, 17 May 2007 14:46:14 +0000 (14:46 +0000)
committerFlorian Westphal <fw@strlen.de>
Thu, 17 May 2007 14:46:14 +0000 (14:46 +0000)
src/ngircd/conn-zip.c

index 040d9f0a630b117345440c78ae47a6c13b0808a8..5ac8323419f2b12b16ac04ae2fb0b24f93f3deb0 100644 (file)
@@ -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.14 2007/05/17 14:46:14 fw 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;
 
@@ -193,10 +192,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;