@@ -1,3 +1,9 @@

+Mon Jan 23 17:09:26 CET 2006 (acab)

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

+  * libclamav:		Fixed more warnings

+  			Wrapped write()

+			Finalized yc emulator

+

 Mon Jan 23 12:12:07 CET 2006 (acab)

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

   * libclamav/yc.c	Fix warnings

@@ -193,7 +193,7 @@ static int unfsg(char *source, char *dest, int ssize, int dsize, char **endsrc,

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

   char *fake, *tsrc;

-  struct SECTION section; // Yup, just one ;)

+  struct SECTION section; /* Yup, just one ;) */

   if ( unfsg(source, dest, ssize, dsize, &fake, &fake) ) return -1;

@@ -202,7 +202,10 @@ int unfsg_200(char *source, char *dest, int ssize, int dsize, uint32_t rva, uint

   section.vsz = dsize;

   section.rva = rva;

   if ( (tsrc = rebuildpe(dest, &section, 1, base, ep, 0, 0)) ) {

-    write(file, tsrc, 0x148+0x80+0x28+dsize);

+    if (cli_writen(file, tsrc, 0x148+0x80+0x28+dsize)==-1) {

+      free(tsrc);

+      return 0;

+    }

     free(tsrc);

   } else {

     cli_dbgmsg("FSG: Rebuilding failed\n");

@@ -262,7 +265,10 @@ int unfsg_133(char *source, char *dest, int ssize, int dsize, struct SECTION *se

   }

   if ( (tsrc = rebuildpe(dest, sections, sectcount+1, base, ep, 0, 0)) ) {

-    write(file, tsrc, 0x148+0x80+0x28*(sectcount+1)+offs);

+    if (cli_writen(file, tsrc, 0x148+0x80+0x28+dsize)==-1) {

+      free(tsrc);

+      return 0;

+    }

     free(tsrc);

   } else {

     cli_dbgmsg("FSG: Rebuilding failed\n");

@@ -232,7 +232,11 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct pe_

       for (t = 0; t < j ; t++)

 	cli_dbgmsg("Petite: .SECT%d RVA:%x VSize:%x ROffset: %x, RSize:% x\n", t, usects[t].rva, usects[t].vsz, usects[t].raw, usects[t].rsz);

       if ( (ssrc = rebuildpe(buf, usects, j, Imagebase, enc_ep, ResRva, ResSize)) ) {

-	write(desc, ssrc, 0x148+0x80+0x28*j+usects[j-1].raw+usects[j-1].rsz);

+	if (cli_writen(desc, ssrc, 0x148+0x80+0x28*j+usects[j-1].raw+usects[j-1].rsz)==-1) {

+	  free(ssrc);

+	  free(usects);

+	  return -1;

+	}

 	free(ssrc);

       } else

 	cli_dbgmsg("Petite: Rebuilding failed\n");

@@ -318,7 +322,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct pe_

        */

       if (!check4resources) {

-	int q;

+	unsigned int q;

 	for ( q = 0 ; q < sectcount ; q++ ) {

 	  if ( thisrva <= EC32(sections[q].VirtualAddress) || thisrva >= EC32(sections[q].VirtualAddress) + EC32(sections[q].VirtualSize))

 	    continue;

@@ -136,7 +136,7 @@ static int yc_poly_emulator(char* decryptor_offset, char* code, unsigned int ecx

 	      if(decryptor_offset[j]=='\xC0') /* ROL AL,num */

 		{

 		  j++;

-		  al = ROL(al,decryptor_offset[j]);

+		  ROL(al,decryptor_offset[j]);

 		}

 	      else			/* ROR AL,num */

 		{

@@ -166,6 +166,7 @@ static int yc_poly_emulator(char* decryptor_offset, char* code, unsigned int ecx

 	    default:

 	      cli_dbgmsg("yC: Unhandled opcode %x\n", (unsigned char)decryptor_offset[j]);

+	      return 1;

 	    }

 	}

       cl--;

@@ -182,7 +183,7 @@ static int yc_poly_emulator(char* decryptor_offset, char* code, unsigned int ecx

 int yc_decrypt(char *fbuf, unsigned int filesize, struct pe_image_section_hdr *sections, unsigned int sectcount, uint32_t peoffset, int desc)

 {

   uint32_t ycsect = EC32(sections[sectcount].PointerToRawData);

-  int i;

+  unsigned int i;

   struct pe_image_file_hdr *pe = (struct pe_image_file_hdr*) (fbuf + peoffset);

   /*