mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-14 02:40:27 +00:00
Code Issues Releases Wiki Activity

conn-zip: fix error handling

Browse Source 
callers of (Un)Zip_Buffer() assume that
the function closes the connection on error.

However, this was not always the case.
This commit is contained in:
Florian Westphal 2009-04-21 19:49:15 +02:00
parent 544b9884f4
commit 84eaed6c9a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,10 +80,12 @@ Zip_InitConn( CONN_ID Idx )
* compression ratios. * compression ratios.
* If the (pre-)compression buffer is full, we try to flush it ("actually * If the (pre-)compression buffer is full, we try to flush it ("actually
* compress some data") and to add the new (uncompressed) data afterwards. * compress some data") and to add the new (uncompressed) data afterwards.
* This function closes the connection on error.
* @param Idx Connection handle. * @param Idx Connection handle.
* @param Data Pointer to the data. * @param Data Pointer to the data.
* @param Len Length of the data to add. * @param Len Length of the data to add.
* @return true on success, false otherwise. */ * @return true on success, false otherwise.
*/
GLOBAL bool GLOBAL bool
Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
{ {
@ -102,9 +104,11 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
/* check again; if zip buf is still too large do not append data: /* check again; if zip buf is still too large do not append data:
* otherwise the zip wbuf would grow too large */ * otherwise the zip wbuf would grow too large */
buflen = array_bytes(&My_Connections[Idx].zip.wbuf); buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
if (buflen + Len >= WRITEBUFFER_SLINK_LEN) if (buflen + Len >= WRITEBUFFER_SLINK_LEN) {
Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len);
Conn_Close(Idx, "Zip Write buffer overflow", NULL, false);
return false; return false;
}
return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len); return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
} /* Zip_Buffer */ } /* Zip_Buffer */
@ -112,6 +116,7 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
/** /**
* Compress data in ZIP buffer and move result to the write buffer of * Compress data in ZIP buffer and move result to the write buffer of
* the connection. * the connection.
* This function closes the connection on error.
* @param Idx Connection handle. * @param Idx Connection handle.
* @return true on success, false otherwise. * @return true on success, false otherwise.
*/ */
@ -180,6 +185,7 @@ Zip_Flush( CONN_ID Idx )
* uncompress data and copy it to read buffer. * uncompress data and copy it to read buffer.
* Returns true if data has been unpacked or no * Returns true if data has been unpacked or no
* compressed data is currently pending in the zread buffer. * compressed data is currently pending in the zread buffer.
* This function closes the connection on error.
* @param Idx Connection handle. * @param Idx Connection handle.
* @return true on success, false otherwise. * @return true on success, false otherwise.
*/ */
@ -230,9 +236,11 @@ Unzip_Buffer( CONN_ID Idx )
#endif #endif
assert(unzipbuf_used <= READBUFFER_LEN); assert(unzipbuf_used <= READBUFFER_LEN);
if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf, if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf,
(size_t)unzipbuf_used)) (size_t)unzipbuf_used)) {
Log (LOG_ALERT, "Decompression error: can't copy data!?");
Conn_Close(Idx, "Decompression error!", NULL, false);
return false; return false;
}
if( in->avail_in > 0 ) { if( in->avail_in > 0 ) {
array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len ); array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len );
} else { } else {