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

+Mon May 17 19:03:51 CEST 2010 (acab)

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

+ * libclamav/pe.c: properly resume stringtable loop (bb#2027)

+                   Note: 0.96 is NOT affected as the min VI sig has got FL=53

+			3rd parties must avoid VI sigs with FL=51

+

 Fri May 14 17:16:19 EEST 2010 (edwin)

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

  * unit_tests: add bytecode.cvd load test

@@ -2522,6 +2522,8 @@ int cli_peheader(fmap_t *map, struct cli_exe_info *peinfo)

 		    while(sfi_sz > 6) { /* enum all stringtables - RESUMABLE */

 			uint32_t st_sz = cli_readint32(vptr) & 0xffff;

+			uint8_t *next_vptr = vptr + st_sz;

+			uint32_t next_sfi_sz = sfi_sz - st_sz;

 			if(st_sz > sfi_sz || st_sz <= 24) {

 			    /* - the content is larger than the container

@@ -2604,8 +2606,8 @@ int cli_peheader(fmap_t *map, struct cli_exe_info *peinfo)

 			    vptr += s_sz;

 			    st_sz -= s_sz;

 			} /* enum all strings - RESUMABLE */

-			vptr += st_sz;

-			sfi_sz -= st_sz;

+			vptr = next_vptr;

+			sfi_sz = next_sfi_sz * (sfi_sz != 0);

 		    } /* enum all stringtables - RESUMABLE */

 		    break;

 		} /* look for stringfileinfo - NOT RESUMABLE */