@@ -1,3 +1,7 @@

+Thu Dec 21 19:16:53 CET 2006 (acab)

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

+  * libclamav: Handle long opt headers in packers, just in case...

+

 Wed Dec 20 16:30:49 CET 2006 (acab)

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

   * clamd, libclamav: Fix implicit function declaration

@@ -124,7 +124,8 @@ char *sudecrypt(int desc, size_t fsize, struct cli_exe_section *sections, uint16

   hunk[6]=sects&0xff;

   hunk[7]=sects>>8;

   cli_writeint32(hunk+0x28, va);

-  memset(hunk+0xf8+0x28*sects, 0, 0x28);

+  hunk+=0x18+(cli_readint32(hunk+0x14)&0xffff); /* size of PE + size of OPT */

+  memset(hunk+0x28*sects, 0, 0x28);

   return file;

 }

@@ -345,7 +345,7 @@ int wwunpack(char *exe, uint32_t exesz, uint32_t headsize, uint32_t min, uint32_

   cli_writeint32(stuff+0x50, csize);

-  stuff+=0xf8;

+  stuff+=0x18+(cli_readint32(stuff+0x14)&0xffff);

   while (sects--) {

     uint32_t v=cli_readint32(stuff+8);

     uint32_t r=cli_readint32(stuff+16);