- in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
- out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
- My_Connections[Idx].rdatalen += out_len;
-
- if( in->avail_in > 0 )
- {
- /* es konnten nicht alle Daten entpackt werden, vermutlich war
- * im Ziel-Puffer kein Platz mehr. Umkopieren ... */
- My_Connections[Idx].zip.rdatalen -= in_len;
- memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
+ assert(z_rdatalen >= in->avail_in);
+ in_len = z_rdatalen - in->avail_in;
+ unzipbuf_used = READBUFFER_LEN - in->avail_out;
+#ifdef DEBUG_ZIP
+ Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN,
+ in->avail_out, unzipbuf_used);
+#endif
+ assert(unzipbuf_used <= READBUFFER_LEN);
+ if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf,
+ (size_t)unzipbuf_used)) {
+ Log (LOG_ALERT, "Decompression error: can't copy data!?");
+ Conn_Close(Idx, "Decompression error!", NULL, false);
+ return false;
+ }
+ if( in->avail_in > 0 ) {
+ array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len );
+ } else {
+ array_trunc( &My_Connections[Idx].zip.rbuf );
+ My_Connections[Idx].zip.bytes_in += unzipbuf_used;