albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

array_start() cannot legally return NULL if array_length() > 0 --> use assert().

This commit is contained in:
Florian Westphal 2007-05-17 14:46:14 +00:00
parent 44afe042d1
commit 07d8da60de
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ngircd/conn-zip.c
View File

@ -22,7 +22,7 @@
/* enable more zlib related debug messages: */ /* enable more zlib related debug messages: */
/* #define DEBUG_ZLIB */ /* #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 "imp.h"
#include <assert.h> #include <assert.h>
@ -122,14 +122,13 @@ Zip_Flush( CONN_ID Idx )
out = &My_Connections[Idx].zip.out; 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); out->avail_in = (uInt)array_bytes(&My_Connections[Idx].zip.wbuf);
if (!out->avail_in) if (!out->avail_in)
return true; /* nothing to do. */ 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->next_out = zipbuf;
out->avail_out = (uInt)sizeof zipbuf; out->avail_out = (uInt)sizeof zipbuf;
@ -195,8 +194,7 @@ Unzip_Buffer( CONN_ID Idx )
in = &My_Connections[Idx].zip.in; in = &My_Connections[Idx].zip.in;
in->next_in = array_start(&My_Connections[Idx].zip.rbuf); in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
if (!in->next_in) assert(in->next_in != NULL);
return false;
in->avail_in = z_rdatalen; in->avail_in = z_rdatalen;
in->next_out = unzipbuf; in->next_out = unzipbuf;