[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 00:52:50 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 762d3dd6c6fae7d2e51358a037f7ea67b9ce048d
Author: aCaB <acab at clamav.net>
Date: Mon Jun 29 11:29:12 2009 +0200
bb#1643
diff --git a/ChangeLog b/ChangeLog
index a7a0e3a..2a5abcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 29 11:25:46 CEST 2009 (acab)
+------------------------------------
+ * clamav-milter/netcode.c: Properly handle clamd disconnection (bb#1643)
+
Mon Jun 22 17:19:45 CEST 2009 (acab)
------------------------------------
* clamav-milter/whitelist.c: print failed whitelist filename
diff --git a/clamav-milter/netcode.c b/clamav-milter/netcode.c
index 34e21b2..de18e60 100644
--- a/clamav-milter/netcode.c
+++ b/clamav-milter/netcode.c
@@ -148,6 +148,11 @@ int nc_send(int s, const void *buff, size_t len) {
struct timeval tv;
char er[256];
+ if(!res) {
+ logg("!Connection closed while sending data\n");
+ close(s);
+ return 1;
+ }
if(res!=-1) {
len-=res;
buf+=res;
@@ -245,6 +250,11 @@ char *nc_recv(int s) {
}
res = recv(s, &buf[len], sizeof(buf) - len, 0);
+ if(!res) {
+ logg("!Connection closed while reading from socket\n");
+ close(s);
+ return NULL;
+ }
if(res==-1) {
char er[256];
strerror_print("!recv failed after successful select");
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list