@@ -1,3 +1,6 @@

+Sat Jan  5 03:07:37 CET 2008 (acab)

+  * libclamav: fix several warnings - mostly format strings

+

 Thu Jan  3 12:38:03 CET 2008 (tk)

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

   * shared/misc.c, clamd/session.c: add support for .cld files (bb#745)

@@ -122,7 +122,7 @@ static int lookup_tree(uint32_t *tree, unsigned int size, uint16_t code, uint8_t

   return -1;

 }

-int explode_init(struct xplstate *X, uint8_t flags) {

+int explode_init(struct xplstate *X, uint16_t flags) {

   X->bits = X->cur = 0;

   if(flags&2) {

     X->largewin = 1;

@@ -311,4 +311,4 @@ int explode(struct xplstate *X) {

   return EXPLODE_EBUFF;

 }

-void explode_shutdown() {};

+void explode_shutdown() {}

@@ -66,7 +66,7 @@ struct xplstate {

   enum XPL_STATE state;

 };

-int explode_init(struct xplstate *, uint8_t);

+int explode_init(struct xplstate *, uint16_t);

 int explode(struct xplstate *);

 void explode_shutdown();

@@ -45,7 +45,6 @@

 #include "fsg.h"

 int unfsg_200(char *source, char *dest, int ssize, int dsize, uint32_t rva, uint32_t base, uint32_t ep, int file) {

-  char *tsrc;

   struct cli_exe_section section; /* Yup, just one ;) */

   if ( cli_unfsg(source, dest, ssize, dsize, NULL, NULL) ) return -1;

@@ -386,7 +386,7 @@ int mew_lzma(char *orgsource, char *buf, uint32_t size_sum, uint32_t vma, uint32

 		var28 = cli_readint32 (source);

 		source += 4;

 		temp = cli_readint32 (source) - vma;

-		var18 = orgsource + temp;

+		var18 = (uint8_t *)(orgsource + temp);

 		if (special) pushed_esi = orgsource + temp;

 		source += 4;

 		temp = cli_readint32 (source);

@@ -562,7 +562,7 @@ int mew_lzma(char *orgsource, char *buf, uint32_t size_sum, uint32_t vma, uint32

 				break;

 			} else {

 				var0C += 2;

-				new_ecx = var18;

+				new_ecx = (char *)var18;

 				new_edx = new_eax = var08;

 				new_eax -= loc_edi;

 				if ( ((var0C < var28 - new_edx) &&

@@ -693,9 +693,9 @@ uint32_t lzma_upack_esi_00(struct lzmastate *p, char *old_ecx, char *bb, uint32_

 	if (!CLI_ISCONTAINED(bb, bl, old_ecx, 4) || !CLI_ISCONTAINED(bb, bl, p->p0, 4))

 	{

 		if (!CLI_ISCONTAINED(bb, bl, old_ecx, 4))

-			cli_dbgmsg("contain error! %08x %08x ecx: %08x [%08x]\n", bb, bl, old_ecx,bb+bl);

+			cli_dbgmsg("contain error! %p %08x ecx: %p [%p]\n", bb, bl, old_ecx,bb+bl);

 		else

-			cli_dbgmsg("contain error! %08x %08x p0: %08x [%08x]\n", bb, bl, p->p0,bb+bl);

+			cli_dbgmsg("contain error! %p %08x p0: %p [%p]\n", bb, bl, p->p0,bb+bl);

 		return 0xffffffff;

 	}

 	ret = cli_readint32(old_ecx);

@@ -730,7 +730,7 @@ uint32_t lzma_upack_esi_00(struct lzmastate *p, char *old_ecx, char *bb, uint32_

  */

 uint32_t lzma_upack_esi_50(struct lzmastate *p, uint32_t old_eax, uint32_t old_ecx, char **old_edx, char *old_ebp, uint32_t *retval, char *bs, uint32_t bl)

 {

-	uint32_t loc_eax = old_eax, original = old_eax, ret;

+	uint32_t loc_eax = old_eax, ret;

 	do {

 		*old_edx = old_ebp + (loc_eax<<2);

@@ -740,7 +740,6 @@ uint32_t lzma_upack_esi_50(struct lzmastate *p, uint32_t old_eax, uint32_t old_e

 		loc_eax += ret;

 	} while (loc_eax < old_ecx);

-/*	cli_dbgmsg("loc_eax: %08x - ecx: %08x = %08x || original: %08x\n", loc_eax, old_ecx, loc_eax - old_ecx, original); */

 	*retval = loc_eax - old_ecx;

 	return 0;

 }

@@ -772,10 +771,10 @@ uint32_t lzma_upack_esi_54(struct lzmastate *p, uint32_t old_eax, uint32_t *old_

 }

-int unmew11(int sectnum, char *src, int off, int ssize, int dsize, uint32_t base, uint32_t vadd, int uselzma, char **endsrc, char **enddst, int filedesc)

+int unmew11(char *src, int off, int ssize, int dsize, uint32_t base, uint32_t vadd, int uselzma, int filedesc)

 {

 	uint32_t entry_point, newedi, loc_ds=dsize, loc_ss=ssize;

-	char *source = src + dsize + off; /*EC32(section_hdr[sectnum].VirtualSize) + off;*/

+	char *source = src + dsize + off;

 	char *lesi = source + 12, *ledi;

 	char *f1, *f2;

 	int i;

@@ -790,7 +789,7 @@ int unmew11(int sectnum, char *src, int off, int ssize, int dsize, uint32_t base

 	ssize -= 12;

 	while (1)

 	{

-  		cli_dbgmsg("MEW unpacking section %d (%08x->%08x)\n", i, lesi, ledi);

+  		cli_dbgmsg("MEW unpacking section %d (%p->%p)\n", i, lesi, ledi);

 		if (!CLI_ISCONTAINED(src, size_sum, lesi, 4) || !CLI_ISCONTAINED(src, size_sum, ledi, 4))

 		{

 			cli_dbgmsg("Possibly programmer error or hand-crafted PE file, report to clamav team\n");

@@ -36,6 +36,6 @@ int mew_lzma(char *, char *, uint32_t, uint32_t, uint32_t);

 uint32_t lzma_upack_esi_00(struct lzmastate *, char *, char *, uint32_t);

 uint32_t lzma_upack_esi_50(struct lzmastate *, uint32_t, uint32_t, char **, char *, uint32_t *, char *, uint32_t);

 uint32_t lzma_upack_esi_54(struct lzmastate *, uint32_t, uint32_t *, char **, uint32_t *, char *, uint32_t);

-int unmew11(int, char *, int, int, int, uint32_t, uint32_t, int, char **, char **, int);

+int unmew11(char *, int, int, int, uint32_t, uint32_t, int, int);

 #endif

@@ -278,7 +278,7 @@ int unmew(char *source, char *dest, int ssize, int dsize, char **endsrc, char **

       }

       if (!CLI_ISCONTAINED(dest, dsize, cdst, myecx_backsize) || !CLI_ISCONTAINED(dest, dsize, cdst-myeax_backbytes, myecx_backsize))

       {

-	cli_dbgmsg("MEW: rete: %d %d %d %d %d || %d %d %d %d %d\n", dest, dsize, cdst, myecx_backsize,

+	cli_dbgmsg("MEW: rete: %p %d %p %d %d || %p %d %p %d %d\n", dest, dsize, cdst, myecx_backsize,

 			CLI_ISCONTAINED(dest, dsize, cdst, myecx_backsize),

 			dest, dsize, cdst-myeax_backbytes, myecx_backsize,

       			CLI_ISCONTAINED(dest, dsize, cdst-myeax_backbytes, myecx_backsize) );

@@ -293,7 +293,7 @@ int unmew(char *source, char *dest, int ssize, int dsize, char **endsrc, char **

       /* 15d */

       if (cdst < dest || cdst >= dest+dsize || csrc < source || csrc >= source+ssize)

       {

-	cli_dbgmsg("MEW: retf %08x %08x+%08x=%08x, %08x %08x+%08x=%08x\n",

+	cli_dbgmsg("MEW: retf %p %p+%08x=%p, %p %p+%08x=%p\n",

 			cdst, dest, dsize, dest+dsize, csrc, source, ssize, source+ssize);

 	return -1;

       }

@@ -83,7 +83,7 @@

 #define CLI_UNPSIZELIMITS(NAME,CHK) \

 if(ctx->limits && ctx->limits->maxfilesize && (CHK) > ctx->limits->maxfilesize) { \

-    cli_dbgmsg(NAME": Sizes exceeded (%lu > %lu)\n", (CHK), ctx->limits->maxfilesize); \

+  cli_dbgmsg(NAME": Sizes exceeded (%lu > %lu)\n", (unsigned long)(CHK), (unsigned long)ctx->limits->maxfilesize); \

     free(exe_sections); \

     if(BLOCKMAX) { \

         *ctx->virname = "PE."NAME".ExceededFileSize"; \

@@ -783,7 +783,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	if (exe_sections[i].rsz) { /* Don't bother with virtual only sections */

 	    if (exe_sections[i].raw >= fsize) { /* really broken */

-	        cli_dbgmsg("Broken PE file - Section %d starts beyond the end of file (Offset@ %d, Total filesize %d)\n", i, exe_sections[i].raw, fsize);

+	      cli_dbgmsg("Broken PE file - Section %d starts beyond the end of file (Offset@ %lu, Total filesize %lu)\n", i, (unsigned long)exe_sections[i].raw, (unsigned long)fsize);

 		free(section_hdr);

 		free(exe_sections);

 		if(DETECT_BROKEN) {

@@ -1103,7 +1103,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	    }

 	    if((bytes = read(desc, buff, 0xb0)) != 0xb0) {

-	        cli_dbgmsg("MEW: Can't read 0xb0 bytes at 0x%x (%d) %d\n", fileoffset, fileoffset, bytes);

+	        cli_dbgmsg("MEW: Can't read 0xb0 bytes at 0x%x (%d) %lu\n", fileoffset, fileoffset, (unsigned long)bytes);

 		break;

 	    }

@@ -1141,12 +1141,12 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	    }

 	    if((bytes = read(desc, src + dsize, exe_sections[i + 1].rsz)) != exe_sections[i + 1].rsz) {

-	        cli_dbgmsg("MEW: Can't read %d bytes [read: %d]\n", exe_sections[i + 1].rsz, bytes);

+	      cli_dbgmsg("MEW: Can't read %d bytes [read: %lu]\n", exe_sections[i + 1].rsz, (unsigned long)bytes);

 		free(exe_sections);

 		free(src);

 		return CL_EIO;

 	    }

-	    cli_dbgmsg("MEW: %d (%08x) bytes read\n", bytes, bytes);

+	    cli_dbgmsg("MEW: %u (%08x) bytes read\n", (unsigned int)bytes, (unsigned int)bytes);

 	    /* count offset to lzma proc, if lzma used, 0xe8 -> call */

 	    if (buff[0x7b] == '\xe8') {

@@ -1161,7 +1161,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	    }

 	    CLI_UNPTEMP("MEW",(src,exe_sections,0));

-	    CLI_UNPRESULTS("MEW",(unmew11(i, src, offdiff, ssize, dsize, EC32(optional_hdr32.ImageBase), exe_sections[0].rva, uselzma, NULL, NULL, ndesc)),1,(src,0));

+	    CLI_UNPRESULTS("MEW",(unmew11(src, offdiff, ssize, dsize, EC32(optional_hdr32.ImageBase), exe_sections[0].rva, uselzma, ndesc)),1,(src,0));

 	    break;

 	}

     }

@@ -1821,7 +1821,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	lseek(desc, 0, SEEK_SET);

 	if((size_t) cli_readn(desc, spinned, fsize) != fsize) {

-	    cli_dbgmsg("PESpin: Can't read %d bytes\n", fsize);

+	    cli_dbgmsg("PESpin: Can't read %lu bytes\n", (unsigned long)fsize);

 	    free(spinned);

 	    free(exe_sections);

 	    return CL_EIO;

@@ -1847,7 +1847,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	lseek(desc, 0, SEEK_SET);

 	if((size_t) cli_readn(desc, spinned, fsize) != fsize) {

-	    cli_dbgmsg("yC: Can't read %d bytes\n", fsize);

+	    cli_dbgmsg("yC: Can't read %lu bytes\n", (unsigned long)fsize);

 	    free(spinned);

 	    free(exe_sections);

 	    return CL_EIO;

@@ -1900,7 +1900,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

             free(src);

             break;

         }

-	if((packer = (char *) cli_calloc(exe_sections[nsections - 1].rsz, sizeof(char))) == NULL) {

+	if((packer = (uint8_t *) cli_calloc(exe_sections[nsections - 1].rsz, sizeof(char))) == NULL) {

 	    free(src);

 	    free(exe_sections);

 	    return CL_EMEM;

@@ -1914,7 +1914,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	}

 	CLI_UNPTEMP("WWPack",(src,packer,exe_sections,0));

-	CLI_UNPRESULTS("WWPack",(wwunpack(src, ssize, packer, exe_sections, nsections-1, e_lfanew, ndesc)),0,(src,packer,0));

+	CLI_UNPRESULTS("WWPack",(wwunpack((uint8_t *)src, ssize, packer, exe_sections, nsections-1, e_lfanew, ndesc)),0,(src,packer,0));

 	break;

     }

@@ -353,7 +353,7 @@ uint32_t very_real_unpack(uint16_t *table, uint32_t tablesz, uint32_t tre, uint3

       if (!CLI_ISCONTAINED(dst, dsize, &dst[unpacked_so_far], backsize) ||

 	  !CLI_ISCONTAINED(dst, dsize, &dst[unpacked_so_far - backbytes], backsize)

 	  ) {

-	cli_dbgmsg("%x %x %x %x\n", dst, dsize, &dst[unpacked_so_far], backsize);

+	cli_dbgmsg("%p %x %p %x\n", dst, dsize, &dst[unpacked_so_far], backsize);

 	return 1;

       }

@@ -232,8 +232,8 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui

   case ALG_IMPLODE: {

     struct xplstate strm;

-    strm.next_in = (char *)src;

-    strm.next_out = obuf;

+    strm.next_in = src;

+    strm.next_out = (uint8_t *)obuf;

     strm.avail_in = csize;

     strm.avail_out = sizeof(obuf);

     if (explode_init(&strm, flags)!=EXPLODE_OK) {

@@ -258,7 +258,7 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui

 	  ret = CL_EIO;

 	  res=1;

 	}

-	strm.next_out = obuf;

+	strm.next_out = (uint8_t *)obuf;

 	strm.avail_out = sizeof(obuf);

 	continue;

       }

@@ -282,7 +282,7 @@ int unupack(int upack, char *dest, uint32_t dsize, char *buff, uint32_t vma, uin

 			if (!CLI_ISCONTAINED(dest, dsize, loc_esi, 12))

 				return -1;

-			cli_dbgmsg("Upack: %08x %08x %08x %08x\n", loc_esi, dest, cli_readint32(loc_esi), base);

+			cli_dbgmsg("Upack: %p %p %08x %08x\n", loc_esi, dest, cli_readint32(loc_esi), base);

 			loc_ebx_u = loc_esi - (dest + cli_readint32(loc_esi) - base);

 			cli_dbgmsg("Upack: EBX: %08x\n", loc_ebx_u);

 			loc_esi += 4;

@@ -401,7 +401,7 @@ int unupack(int upack, char *dest, uint32_t dsize, char *buff, uint32_t vma, uin

 	while(save3) {

 		if (!CLI_ISCONTAINED(dest, dsize, pushed_esi + loc_ecx, 1))

 		{

-			cli_dbgmsg("Upack: callfixerr %08x %08x = %08x, %08x\n", dest, dsize, dest+dsize, pushed_esi+loc_ecx);

+			cli_dbgmsg("Upack: callfixerr %p %08x = %p, %p\n", dest, dsize, dest+dsize, pushed_esi+loc_ecx);

 			return -1;

 		}

 		if (pushed_esi[loc_ecx] == '\xe8' || pushed_esi[loc_ecx] == '\xe9')

@@ -445,7 +445,7 @@ int unupack399(char *bs, uint32_t bl, uint32_t init_eax, char *init_ebx, uint32_

 	p.p1 = cli_readint32(init_ebx);

 	p.p2 = cli_readint32(init_ebx + 4);

-	cli_dbgmsg("\n\tp0: %08x\n\tp1: %08x\n\tp2: %08x\n", p.p0, p.p1, p.p2);

+	cli_dbgmsg("\n\tp0: %p\n\tp1: %08x\n\tp2: %08x\n", p.p0, p.p1, p.p2);

 	for (i = 0; i<6; i++)

 		state[i] = cli_readint32(loc_ebx + (i<<2)),

 		cli_dbgmsg("state[%d] = %08x\n", i, state[i]);

@@ -219,7 +219,7 @@ int wwunpack(uint8_t *exe, uint32_t exesz, uint8_t *wwsect, struct cli_exe_secti

     cli_writeint32(&exe[pe+0x28], cli_readint32(wwsect+0x295)+sects[scount].rva+0x299);

     cli_writeint32(&exe[pe+0x50], cli_readint32(&exe[pe+0x50])-sects[scount].vsz);

-    structs = &exe[0xffff&cli_readint32(&exe[pe+0x14])+pe+0x18];

+    structs = &exe[(0xffff&cli_readint32(&exe[pe+0x14]))+pe+0x18];

     for(i=0 ; i<scount ; i++) {

       cli_writeint32(structs+8, sects[i].vsz);

       cli_writeint32(structs+12, sects[i].rva);