@@ -48,6 +48,7 @@ Mark Mielke <mark*mark.mielke.cc>

 Arkadiusz Miskiewicz <misiek*pld.org.pl>

 Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>

 Masaki Ogawa <proc*mac.com>

+Rudolph Pereira <r.pereira*isu.usyd.edu.au>

 Ed Phillips <ed*UDel.Edu>

 Andreas Piesk <Andreas.Piesk*heise.de>

 Ant La Porte <ant*dvere.net>

@@ -1,3 +1,15 @@

+Sat Nov 15 01:17:29 CET 2003 (tk)

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

+  * libclamav: cli_scanzip: do malloc() outside of the zip scanning loop;

+	       handle properly write error condition (patches by Rudolph

+	       Pereira <r.pereira*isu.usyd.edu.au>)

+  * libclamav: zziplib: fixed comp. problem under FreeBSD 5 (Rudolph Pereira)

+  * freshclam: fixed compilation error under Cygwin (patch by Robert Hogan

+	       <robert*roberthogan.net>)

+  * libclamav: cli_scanzip: increased oversize ratio

+  * freshclam: always initialize the ipaddr variable (patch by Mark Mielke

+	       <mark@mark.mielke.cc>)

+

 Thu Nov 13 20:03:53 CET 2003 (tk)

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

   * clamav-milter/Makefile: clamav-milter.8 manual path fixed

@@ -42,9 +42,9 @@

 void freshclam(struct optstruct *opt)

 {

 	int ret;

+	char *newdir;

 #ifndef C_CYGWIN

 	struct passwd *user;

-	char *newdir;

 	char *unpuser;

     if(optc(opt, 'u'))

@@ -143,7 +143,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 	mprintf("Connecting via %s\n", proxy);

     if(ip[0])

-	hostfd = wwwconnect(ip, proxy, NULL); /* we use ip to connect */

+	hostfd = wwwconnect(ip, proxy, ipaddr); /* we use ip to connect */

     else

 	hostfd = wwwconnect(hostname, proxy, ipaddr);

@@ -61,7 +61,7 @@ int cli_scanrar_inuse = 0;

 #define DELIVERED_MAGIC_STR "Delivered-To: "

 #define BZIP_MAGIC_STR "BZh"

-#define ZIPOSDET 20 /* FIXME: Make it user definable */

+#define ZIPOSDET 50 /* FIXME: Make it user definable */

 int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

@@ -256,6 +256,11 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

     fstat(desc, &source);

+    if(!(buff = (char *) cli_malloc(FILEBUFF))) {

+	zzip_dir_close(zdir);

+	return CL_EMEM;

+    }

+

     while(zzip_dir_read(zdir, &zdirent)) {

 	if(!zdirent.d_name || !strlen(zdirent.d_name)) { /* Mimail fix */

@@ -317,23 +322,18 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

 	    break;

 	}

-	if(!(buff = (char *) cli_malloc(FILEBUFF))) {

-	    ret = CL_EMEM;

-	    break;

-	}

 	while((bytes = zzip_file_read(zfp, buff, FILEBUFF)) > 0) {

 	    if(fwrite(buff, bytes, 1, tmp)*bytes != bytes) {

 		cli_dbgmsg("Zip -> Can't fwrite() file: %s\n", strerror(errno));

 		zzip_file_close(zfp);

-		files++;

+		zzip_dir_close(zdir);

+		fclose(tmp);

 		free(buff);

-		ret = CL_EZIP;

-		break;

+		return CL_EZIP;

 	    }

 	}

-	free(buff);

 	zzip_file_close(zfp);

 	if(fflush(tmp) != 0) {

@@ -372,6 +372,8 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

 	fclose(tmp);

 	tmp = NULL;

     }

+

+    free(buff);

     return ret;

 }

@@ -29,6 +29,11 @@

 # endif

 #endif

+#include <target.h>

+#ifdef TARGET_OS_FREEBSD

+#include <sys/types.h>

+#endif

+

 /* especially win32 platforms do not declare off_t so far - see zzip-msvc.h */

 #ifndef _zzip_off_t

 #ifdef   ZZIP_off_t