mirror/clamav
1
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2026-05-06 22:55:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

bb#2306

Browse Source
This commit is contained in:
aCaB
2010-10-14 16:16:15 +02:00
parent f238189223
commit f3552035bf
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
Thu Oct 14 16:14:01 CEST 2010 (acab)
------------------------------------
* libclamav/fmap.c: properly check for pread errors (bb#2306)
Thu Oct 14 16:06:06 CEST 2010 (acab)
------------------------------------
* clamd: properly terminate zSTATS (bb#2286)

3
libclamav/fmap.c
View File

@@ -207,7 +207,7 @@ static void fmap_aging(fmap_t *m) {
static int fmap_readpage(fmap_t *m, unsigned int first_page, unsigned int count, unsigned int lock_count) {
size_t readsz = 0, eintr_off, got;
size_t readsz = 0, eintr_off;
char *pptr = NULL, err[256];
uint32_t s;
unsigned int i, page = first_page, force_read = 0;
@@ -277,6 +277,7 @@ static int fmap_readpage(fmap_t *m, unsigned int first_page, unsigned int count,
eintr_off = 0;
while(readsz) {
ssize_t got;
got=pread(m->fd, pptr, readsz, eintr_off + m->offset + first_page * m->pgsz);
if(got < 0 && errno == EINTR)