@@ -80,6 +80,7 @@ Dean Gaudet <dean-clamav*arctic.org>

 Michel Gaudet <Michel.Gaudet*ehess.fr>

 Philippe Gay <ph.gay*free.fr>

 Luca 'NERvOus' Gibelli <nervous*clamav.net>

+Scott Gifford <sgifford*suspectclass.com>

 Nigel Horne <njh*smsltd.demon.co.uk>

 Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

 Robert Hogan <robert*roberthogan.net>

@@ -124,5 +125,6 @@ Michael L Torrie <torriem*chem.byu.edu>

 Laurent Wacrenier <lwa*teaser.fr>

 David Woakes <david*mitredata.co.uk>

 Dale Woolridge <dwoolridge*drh.net>

+Zeffie <zeffie*zeffie.com>

 Leonid Zeitlin <lz*europe.com>

 Andoni Zubimendi <andoni*lpsat.net>

@@ -1,3 +1,13 @@

+Mon Jun 21 21:20:47 EDT 2004 (tk)

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

+  * libclamav: scanners: prevent division by zero in compression ratio

+	       calculation of broken zips (patch by Trog)

+  * clamd: fix logic error that prevented all files from being scanned if

+	   there was no /proc filesystem on Linux system (patch by

+	   Scott Gifford <sgifford*suspectclass.com>)

+  * libclamav: fix compilation error with old glibc (patch by Zeffie

+	       <zeffie*zeffie.com>)

+

 Mon Jun 21 16:23:07 BST 2004 (trog)

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

   * libclamac/ole2_extract.c: Don't try and process (probably corrupt) files

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20040612

+	echo devel-20040621

 	exit 0

 	;;

@@ -108,15 +108,12 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 			    if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks"))) {

 #ifdef C_LINUX

-				if(procdev) {

-				    if(statbuf.st_dev == procdev)

-					scanret = CL_CLEAN;

-				    else

-					scanret = cl_scanfile(fname, virname, scanned, root, limits, options);

-				}

-#else

-				scanret = cl_scanfile(fname, virname, scanned, root, limits, options);

+				if(procdev && (statbuf.st_dev == procdev))

+				    scanret = CL_CLEAN;

+				else

 #endif

+				    scanret = cl_scanfile(fname, virname, scanned, root, limits, options);

+

 				if(scanret == CL_VIRUS) {

 				    mdprintf(odesc, "%s: %s FOUND\n", fname, *virname);

@@ -183,15 +180,11 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 		return 0;

 	    }

 #ifdef C_LINUX

-	    if(procdev) {

-		if(sb.st_dev == procdev)

-		    ret = CL_CLEAN;

-		else

-		    ret = cl_scanfile(filename, &virname, scanned, root, limits, options);

-	    }

-#else

-	    ret = cl_scanfile(filename, &virname, scanned, root, limits, options);

+	    if(procdev && (sb.st_dev == procdev))

+		ret = CL_CLEAN;

+	    else

 #endif

+		ret = cl_scanfile(filename, &virname, scanned, root, limits, options);

 	    if(ret == CL_VIRUS) {

 		mdprintf(odesc, "%s: %s FOUND\n", filename, virname);

@@ -402,19 +402,13 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	cli_dbgmsg("Zip -> %s, compressed: %u, normal: %u, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_csize, zdirent.st_size, zdirent.st_size / (zdirent.d_csize+1), limits ? limits->maxratio : -1 );

-	if(!zdirent.st_size) { /* omit directories and null files */

+	if(!zdirent.st_size) { /* omit directories and empty files */

 	    files++;

 	    continue;

 	}

-	if(limits && limits->maxratio > 0 && ((unsigned) zdirent.st_size / (unsigned) zdirent.d_csize) >= limits->maxratio) {

-	    *virname = "Oversized.Zip";

-	    ret = CL_VIRUS;

-	    break;

-        }

-

 	/* work-around for problematic zips (zziplib crashes with them) */

-	if(zdirent.d_csize < 0 || zdirent.st_size < 0) {

+	if(zdirent.d_csize <= 0 || zdirent.st_size < 0) {

 	    files++;

 	    cli_dbgmsg("Zip -> Malformed archive detected.\n");

 	    /* ret = CL_EMALFZIP; */

@@ -424,6 +418,12 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	    break;

 	}

+	if(limits && limits->maxratio > 0 && ((unsigned) zdirent.st_size / (unsigned) zdirent.d_csize) >= limits->maxratio) {

+	    *virname = "Oversized.Zip";

+	    ret = CL_VIRUS;

+	    break;

+        }

+

 	if(DETECT_ENCRYPTED && (zdirent.d_flags & 1 )) {

 	    files++;

 	    cli_dbgmsg("Zip -> Encrypted files found in archive.\n");

@@ -18,24 +18,24 @@

 #elif defined ZZIP_HAVE_INTTYPES_H /*freebsd*/

 #include <inttypes.h>

 #else

-    typedef unsigned char uint8_t;      typedef signed char int8_t;

+    typedef unsigned char uint8_tz;      typedef signed char int8_tz;

 # if ZZIP_SIZEOF_INT && ZZIP_SIZEOF_INT == 2

-    typedef unsigned int uint16_t;      typedef signed int int16_t;

+    typedef unsigned int uint16_tz;      typedef signed int int16_tz;

 # elif ZZIP_SIZEOF_SHORT && ZZIP_SIZEOF_SHORT == 2

-    typedef unsigned short uint16_t;    typedef signed short int16_t;

+    typedef unsigned short uint16_tz;    typedef signed short int16_tz;

 # else

-#   error unable to typedef int16_t from either int or short

-    typedef unsigned short uint16_t;    typedef signed short int16_t;

+#   error unable to typedef int16_tz from either int or short

+    typedef unsigned short uint16_tz;    typedef signed short int16_tz;

 # endif

 # if defined ZZIP_SIZEOF_INT && ZZIP_SIZEOF_INT == 4

-    typedef unsigned int uint32_t;      typedef signed int int32_t;

+    typedef unsigned int uint32_tz;      typedef signed int int32_tz;

 # elif defined ZZIP_SIZEOF_LONG && ZZIP_SIZEOF_LONG == 4

-    typedef unsigned long uint32_t;     typedef signed long int32_t;

+    typedef unsigned long uint32_tz;     typedef signed long int32_tz;

 # else

-#   error unable to typedef int32_t from either int or long

-    typedef unsigned long uint32_t;     typedef signed long int32_t;

+#   error unable to typedef int32_tz from either int or long

+    typedef unsigned long uint32_tz;     typedef signed long int32_tz;

 # endif

 #endif

@@ -44,18 +44,18 @@

  * Make 32 bit value in host byteorder from little-endian mapped octet-data

  * (works also on machines which SIGBUS on misaligned data access (eg. 68000))

  */

-uint32_t __zzip_get32(unsigned char * s)

+uint32_tz __zzip_get32(unsigned char * s)

 {

-  return ((uint32_t)s[3] << 24) | ((uint32_t)s[2] << 16)

-    |    ((uint32_t)s[1] << 8)  |  (uint32_t)s[0];

+  return ((uint32_tz)s[3] << 24) | ((uint32_tz)s[2] << 16)

+    |    ((uint32_tz)s[1] << 8)  |  (uint32_tz)s[0];

 }

 /** => __zzip_get32

  * This function does the same for a 16 bit value.

  */

-uint16_t __zzip_get16(unsigned char * s)

+uint16_tz __zzip_get16(unsigned char * s)

 {

-    return ((uint16_t)s[1] << 8) | (uint16_t)s[0];

+    return ((uint16_tz)s[1] << 8) | (uint16_tz)s[0];

 }

 /* ---------------------------  internals  -------------------------------- */

@@ -342,14 +342,14 @@ __zzip_parse_root_directory(int fd,

     auto struct zzip_root_dirent dirent;

     struct zzip_dir_hdr * hdr;

     struct zzip_dir_hdr * hdr0;

-    uint16_t * p_reclen = 0;

+    uint16_tz * p_reclen = 0;

     short entries; 

     long offset;          /* offset from start of root directory */

     char* fd_map = 0; 

-    int32_t  fd_gap = 0;

-    uint16_t u_entries  = ZZIP_GET16(trailer->z_entries);   

-    uint32_t u_rootsize = ZZIP_GET32(trailer->z_rootsize);  

-    uint32_t u_rootseek = ZZIP_GET32(trailer->z_rootseek);

+    int32_tz  fd_gap = 0;

+    uint16_tz u_entries  = ZZIP_GET16(trailer->z_entries);   

+    uint32_tz u_rootsize = ZZIP_GET32(trailer->z_rootsize);  

+    uint32_tz u_rootseek = ZZIP_GET32(trailer->z_rootseek);

     __correct_rootseek (u_rootseek, u_rootsize, trailer);

     hdr0 = (struct zzip_dir_hdr*) malloc(u_rootsize);

@@ -375,8 +375,8 @@ __zzip_parse_root_directory(int fd,

     for (entries=u_entries, offset=0; entries > 0; entries--)

     {

         register struct zzip_root_dirent * d;

-        uint16_t u_extras, u_comment, u_namlen;

-	uint16_t u_flags;

+        uint16_tz u_extras, u_comment, u_namlen;

+	uint16_tz u_flags;

         if (fd_map) 

 	{ d = (void*)(fd_map+fd_gap+offset); } /* fd_map+fd_gap==u_rootseek */

@@ -414,10 +414,10 @@ __zzip_parse_root_directory(int fd,

         hdr->d_csize = ZZIP_GET32(d->z_csize); 

         hdr->d_usize = ZZIP_GET32(d->z_usize); 

         hdr->d_off   = ZZIP_GET32(d->z_off);

-        hdr->d_compr = (uint8_t)ZZIP_GET16(d->z_compr);

+        hdr->d_compr = (uint8_tz)ZZIP_GET16(d->z_compr);

 	hdr->d_flags = u_flags;

-        /* bull: hdr->d_compr is uint8_t

+        /* bull: hdr->d_compr is uint8_tz

 	 * if (hdr->d_compr > 255) hdr->d_compr = 255; */

 	if (offset+sizeof(*d) + u_namlen > u_rootsize)

@@ -448,7 +448,7 @@ __zzip_parse_root_directory(int fd,

         {   register char* p = (char*) hdr; 

             register char* q = aligned4 (p + sizeof(*hdr) + u_namlen + 1);

-            *p_reclen = (uint16_t)(q - p);

+            *p_reclen = (uint16_tz)(q - p);

             hdr = (struct zzip_dir_hdr*) q;

         }

     }/*for*/

@@ -27,14 +27,14 @@

  */

 struct zzip_dir_hdr

 {

-    uint32_t    d_usize;        /* uncompressed size */

-    uint32_t    d_csize;        /* compressed size */

-    uint32_t    d_crc32;        /* the adler32-checksum */

-    uint32_t    d_off;          /* offset of file in zipfile */

-    uint16_t    d_reclen;       /* next dir_hdr structure offset */

-    uint16_t    d_namlen;       /* explicit namelen of d_name */

-    uint8_t     d_compr;        /* the compression type, 0 = store, 8 = inflate */

-    uint16_t	d_flags;	/* general purpose flags */

+    uint32_tz    d_usize;        /* uncompressed size */

+    uint32_tz    d_csize;        /* compressed size */

+    uint32_tz    d_crc32;        /* the adler32-checksum */

+    uint32_tz    d_off;          /* offset of file in zipfile */

+    uint16_tz    d_reclen;       /* next dir_hdr structure offset */

+    uint16_tz    d_namlen;       /* explicit namelen of d_name */

+    uint8_tz     d_compr;        /* the compression type, 0 = store, 8 = inflate */

+    uint16_tz	d_flags;	/* general purpose flags */

     char        d_name[1];      /* the actual name of the entry, may contain DIRSEPs */

 };

 #define _ZZIP_DIRENT_HAVE_D_NAMLEN

@@ -80,12 +80,12 @@ ZZIP_DIR* /*depracated*/

 zzip_dir_alloc_ext_io (zzip_strings_t* ext, const zzip_plugin_io_t io);

 /* get 16/32 bits from little-endian zip-file to host byteorder */

-uint32_t __zzip_get32(unsigned char * s);

-uint16_t __zzip_get16(unsigned char * s);

+uint32_tz __zzip_get32(unsigned char * s);

+uint16_tz __zzip_get16(unsigned char * s);

 #ifdef __i386__

-#define ZZIP_GET32(x) (*(uint32_t*)(x))

-#define ZZIP_GET16(x) (*(uint16_t*)(x))

+#define ZZIP_GET32(x) (*(uint32_tz*)(x))

+#define ZZIP_GET16(x) (*(uint16_tz*)(x))

 #else

 #define ZZIP_GET32(x) (__zzip_get32(x))

 #define ZZIP_GET16(x) (__zzip_get16(x))

@@ -72,10 +72,10 @@ struct zzip_file_trailer

 {

 #   define ZZIP_FILE_TRAILER_MAGIC 0x08074B50

 #   define ZZIP_FILE_TRAILER_CHECKMAGIC(__p) ZZIP_CHECKMAGIC(__p,'P','K','\7','\8')

-    uint32_t z_magic; /* data descriptor signature (0x08074b50) */

-    uint32_t z_crc32; /* crc-32 */

-    uint32_t z_csize; /* compressed size */

-    uint32_t z_usize; /* uncompressed size */

+    uint32_tz z_magic; /* data descriptor signature (0x08074b50) */

+    uint32_tz z_crc32; /* crc-32 */

+    uint32_tz z_csize; /* compressed size */

+    uint32_tz z_usize; /* uncompressed size */

 } __attribute__((packed));

 /* C. central directory structure: