diff options
| author | Andreas Metzler <ametzler@downhill.at.eu.org> | 2015-06-07 15:16:35 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-06-07 15:16:35 +0100 |
| commit | 80591636e0439c7bc83b1fb322fd110b397f4217 (patch) | |
| tree | 65b979be1a836cabf06333860cef9aedaa2df349 | |
| parent | ff1c79bc224878d274eebc592750e525d1a98f9b (diff) | |
Content scan: Use ETIMEDOUT not ETIME, as having better portability. Bug 1640
| -rw-r--r-- | src/src/malware.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/src/malware.c b/src/src/malware.c index 17a652a90..141c6ea16 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -879,7 +879,7 @@ if (!malware_ok) for (;;) { - errno = ETIME; + errno = ETIMEDOUT; i = av_buffer+sizeof(av_buffer)-p; if ((bread= ip_recv(sock, p, i-1, tmo-time(NULL))) < 0) return m_errlog_defer_3(scanent, @@ -1212,7 +1212,7 @@ if (!malware_ok) * WITH_OLD_CLAMAV_STREAM is defined. * See Exim bug 926 for details. */ - uschar *p, *vname, *result_tag, *response_end; + uschar *p, *vname, *result_tag; int bread=0; uschar * file_name; uschar av_buffer[1024]; @@ -1614,10 +1614,9 @@ if (!malware_ok) while (isspace(*--p) && (p > av_buffer)) *p = '\0'; if (*p) ++p; - response_end = p; /* colon in returned output? */ - if((p = Ustrchr(av_buffer,':')) == NULL) + if(!(p = Ustrchr(av_buffer,':'))) return m_errlog_defer(scanent, string_sprintf( "ClamAV returned malformed result (missing colon): %s", av_buffer)); |