@@ -1,3 +1,8 @@

+Fri Apr 10 18:20:12 EEST 2009 (edwin)

+-------------------------------------

+ * libclamav/vba_extract.c: avoid size 1 reads for performance

+ reasons (bb #1542).

+

 Fri Apr 10 16:23:00 EEST 2009 (edwin)

 -------------------------------------

  * libclamav/pe.c, libclamav/special.c, libclamav/special.h: Fix some

@@ -1174,14 +1174,20 @@ cli_wm_decrypt_macro(int fd, off_t offset, uint32_t len, unsigned char key)

 static int

 skip_past_nul(int fd)

 {

-	char ch;

-

-	do

-		if(cli_readn(fd, &ch, 1) != 1)

-			return FALSE;

-	while(ch);

-

-	return TRUE;

+    char *end;

+    char smallbuf[128];

+

+    do {

+	int nread = cli_readn(fd, smallbuf, sizeof(smallbuf));

+	if (nread <= 0)

+	    return FALSE;

+	end = memchr(smallbuf, '\0', nread);

+	if (end) {

+	    if (lseek(fd, 1 + (end-smallbuf) - nread, SEEK_CUR) < 0)

+		return FALSE;

+	    return TRUE;

+	}

+    } while (1);

 }

 /*