@@ -1,3 +1,11 @@

+Fri Mar 18 13:48:40 GMT 2005 (trog)

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

+  * clamd/scanner.c: fix ports scan loop

+

+  * clamd/server-th.c, libclamav/vba_extract.c, libclamav/special.c,

+	libclamav/chmunpack.c, libclamav/ole2_extract.c:

+		Fix compiler warnings.

+

 Fri Mar 18 12:46:49 CET 2005 (tk)

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

   * update copyright information

@@ -325,7 +325,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	max_port = 2048;

     /* bind to a free port */

-    while(!bound && portscan--) {

+    while(!bound && --portscan) {

 	if(rnd_port_first) {

 	    /* try a random port first */

 	    port = min_port + cli_rndnum(max_port - min_port + 1);

@@ -543,7 +543,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	if(selfchk) {

 	    time(&current_time);

-	    if((current_time - start_time) > selfchk) {

+	    if((current_time - start_time) > (time_t)selfchk) {

 		if(reload_db(root, copt, TRUE)) {

 		    pthread_mutex_lock(&reload_mutex);

 		    reload = 1;

@@ -184,7 +184,7 @@ static uint64_t chm_endian_convert_64(uint64_t v)

 #endif

 /* Read in a block of data from either the mmap area or the given fd */

-int chm_read_data(int fd, unsigned char *dest, off_t offset, uint32_t len,

+int chm_read_data(int fd, unsigned char *dest, off_t offset, off_t len,

 			unsigned char *m_area, off_t m_length)

 {

 	if (m_area != NULL) {

@@ -203,7 +203,7 @@ int chm_read_data(int fd, unsigned char *dest, off_t offset, uint32_t len,

 	return TRUE;

 }

-int chm_copy_file_data(int ifd, int ofd, uint64_t len)

+uint64_t chm_copy_file_data(int ifd, int ofd, uint64_t len)

 {

 	unsigned char data[8192];

 	uint64_t count, rem;

@@ -217,7 +217,7 @@ int chm_copy_file_data(int ifd, int ofd, uint64_t len)

 		if (count != todo) {

 			return len-rem;

 		}

-		if (cli_writen(ofd, data, count) != count) {

+		if (cli_writen(ofd, data, count) != (int64_t)count) {

 			return len-rem-count;

 		}

 		rem -= count;

@@ -437,12 +437,12 @@ static uint64_t read_enc_int(unsigned char **start, unsigned char *end)

 	current = *start;

 	if (current > end) {

-		return -1;

+		return 0;

 	}

 	do {

 		if (current > end) {

-			return -1;

+			return 0;

 		}

 		retval = (retval << 7) | (*current & 0x7f);

 	} while (*current++ & 0x80);

@@ -476,7 +476,7 @@ static int read_chunk_entries(unsigned char *chunk, uint32_t chunk_len,

 		}

 		file_e->next = NULL;

-		if ((name_len = read_enc_int(&current, end)) < 0) return FALSE;

+		name_len = read_enc_int(&current, end);

 		file_e->name = (unsigned char *) cli_malloc(name_len+1);

 		if (!file_e->name) {

 			free(file_e);

@@ -485,21 +485,9 @@ static int read_chunk_entries(unsigned char *chunk, uint32_t chunk_len,

 		strncpy(file_e->name, current, name_len);

 		file_e->name[name_len] = '\0';

 		current += name_len;

-		if ((file_e->section = read_enc_int(&current, end)) < 0) {

-			free(file_e->name);

-			free(file_e);

-			return FALSE;

-		}

-		if ((file_e->offset = read_enc_int(&current, end)) < 0) {

-			free(file_e->name);

-			free(file_e);

-			return FALSE;

-		}

-		if ((file_e->length = read_enc_int(&current, end)) < 0) {

-			free(file_e->name);

-			free(file_e);

-			return FALSE;

-		}

+		file_e->section = read_enc_int(&current, end);

+		file_e->offset = read_enc_int(&current, end);

+		file_e->length = read_enc_int(&current, end);

 		if ((name_len >= 2) && (file_e->name[0] == ':') &&

 				(file_e->name[1] == ':')) {

 			file_e->next = sys_file_l->next;

@@ -969,7 +957,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 			entry = entry->next;

 			continue;

 		}

-		if (lseek(mf_out.desc, entry->offset, SEEK_SET) != entry->offset) {

+		if (lseek(mf_out.desc, entry->offset, SEEK_SET) != (off_t)entry->offset) {

 			cli_dbgmsg("seek in output failed\n");

 			entry = entry->next;

 			continue;

@@ -981,8 +969,8 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 			entry = entry->next;

 			continue;

 		}

-		if ((length=chm_copy_file_data(mf_out.desc, ofd, entry->length)) != entry->length) {

-			cli_dbgmsg("copied %d of %d\n", length, entry->length);

+		if (chm_copy_file_data(mf_out.desc, ofd, entry->length) != entry->length) {

+			cli_dbgmsg("failed to copy %lu bytes\n", entry->length);

 		}

 		close(ofd);		

@@ -633,7 +633,7 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 	}

 	while((current_block >= 0) && (len > 0)) {

-		if (prop->size < hdr->sbat_cutoff) {

+		if (prop->size < (int64_t)hdr->sbat_cutoff) {

 			/* Small block file */

 			if (!ole2_get_sbat_data_block(fd, hdr, buff, current_block)) {

 				cli_dbgmsg("ole2_get_sbat_data_block failed\n");

@@ -359,7 +359,7 @@ int cli_check_riff_exploit(int fd)

 	offset = lseek(fd, 0, SEEK_CUR);

-	if (offset < chunk_size) {

+	if (offset < (int64_t)chunk_size) {

 		retval = 2;

 	}

 	return retval;

@@ -757,7 +757,7 @@ static int ppt_unlzw(const char *dir, int fd, uint32_t length)

 	stream.next_in = inbuff;

 	bufflen = stream.avail_in = MIN(length, PPT_LZW_BUFFSIZE);

-	if (cli_readn(fd, inbuff, stream.avail_in) != stream.avail_in) {

+	if (cli_readn(fd, inbuff, stream.avail_in) != (int64_t)stream.avail_in) {

 		close(ofd);

 		return FALSE;

 	}

@@ -785,7 +785,7 @@ static int ppt_unlzw(const char *dir, int fd, uint32_t length)

 		if (stream.avail_in == 0) {

 			stream.next_in = inbuff;

 			bufflen = stream.avail_in = MIN(length, PPT_LZW_BUFFSIZE);

-			if (cli_readn(fd, inbuff, stream.avail_in) != stream.avail_in) {

+			if (cli_readn(fd, inbuff, stream.avail_in) != (int64_t)stream.avail_in) {

 				close(ofd);

 				inflateEnd(&stream);

 				return FALSE;

@@ -795,7 +795,7 @@ static int ppt_unlzw(const char *dir, int fd, uint32_t length)

 		retval = inflate(&stream, Z_NO_FLUSH);

 	} while (retval == Z_OK);

-	if (cli_writen(ofd, outbuff, bufflen) != bufflen) {

+	if (cli_writen(ofd, outbuff, bufflen) != (int64_t)bufflen) {

 		close(ofd);

 		inflateEnd(&stream);

 		return FALSE;

@@ -853,7 +853,7 @@ static char *ppt_stream_iter(int fd)

 		} else {

 			offset = lseek(fd, 0, SEEK_CUR);

 			/* Check we don't wrap */

-			if ((offset + atom_header.length) < offset) {

+			if ((offset + (off_t)atom_header.length) < offset) {

 				break;

 			}

 			offset += atom_header.length;

@@ -1470,7 +1470,7 @@ vba_project_t *wm_dir_read(const char *dir)

 	}

 	wm_print_fib(&fib);

-	if (lseek(fd, fib.macro_offset, SEEK_SET) != fib.macro_offset) {

+	if (lseek(fd, fib.macro_offset, SEEK_SET) != (int64_t)fib.macro_offset) {

 		cli_dbgmsg("lseek macro_offset failed\n");

 		close(fd);

 		return NULL;

@@ -1611,7 +1611,7 @@ unsigned char *wm_decrypt_macro(int fd, uint32_t offset, uint32_t len,

 	unsigned char *buff;

 	uint32_t i;

-	if (lseek(fd, offset, SEEK_SET) != offset) {

+	if (lseek(fd, offset, SEEK_SET) != (int64_t)offset) {

 		return NULL;

 	}

 	buff = (unsigned char *) cli_malloc(len);

@@ -1619,7 +1619,7 @@ unsigned char *wm_decrypt_macro(int fd, uint32_t offset, uint32_t len,

 		return NULL;

 	}

-	if (cli_readn(fd, buff, len) != len) {

+	if (cli_readn(fd, buff, len) != (int64_t)len) {

 		free(buff);

 		return NULL;

 	}