[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit d90f43a17682c9f5159877f30e71a171762886d6
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Oct 26 13:09:19 2009 +0100

    clamdscan/proto.c: handle recv() == 0 (bb#1717)

diff --git a/ChangeLog b/ChangeLog
index e1dcf5e..a523bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 26 13:08:41 CET 2009 (tk)
+---------------------------------
+ * clamdscan/proto.c: handle recv() == 0 (bb#1717)
+
 Sat Oct 24 15:06:50 CEST 2009 (acab)
 ------------------------------------
  * libclamav/mpool.c: increase max pool to 8M to allow loading huge custom dbs
diff --git a/clamdscan/proto.c b/clamdscan/proto.c
index c1c3128..8a199e9 100644
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@@ -426,7 +426,7 @@ struct client_parallel_data {
 
 /* Sends a proper scan request to clamd and parses its replies
  * This is used only in IDSESSION mode
- * Returns 0 on success, 1 on hard failures */
+ * Returns 0 on success, 1 on hard failures, 2 on len == 0 (bb#1717) */
 static int dspresult(struct client_parallel_data *c) {
     const char *filename;
     char *bol, *eol;
@@ -439,7 +439,7 @@ static int dspresult(struct client_parallel_data *c) {
     do {
 	len = recvln(&rcv, &bol, &eol);
 	if(len < 0) return 1;
-	if(!len) return 0;
+	if(!len) return 2;
 	if((rid = atoi(bol))) {
 	    id = &c->ids;
 	    while(*id) {

-- 
Debian repository for ClamAV