@@ -891,7 +891,7 @@ int unmew11(char *src, int off, int ssize, int dsize, uint32_t base, uint32_t va

 		section[0].raw = 0; section[0].rva = vadd;

 		section[0].rsz = section[0].vsz = dsize;

 	}

-	if (!cli_rebuildpe(src, section, i, base, entry_point - base, 0, 0, filedesc))

+	if (!cli_rebuildpe_align(src, section, i, base, entry_point - base, 0, 0, filedesc, 0x1000))

 	{

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

 		free(section);

@@ -121,6 +121,11 @@ struct IMAGE_PE_HEADER {

 int cli_rebuildpe(char *buffer, struct cli_exe_section *sections, int sects, uint32_t base, uint32_t ep, uint32_t ResRva, uint32_t ResSize, int file)

 {

+  return cli_rebuildpe_align(buffer, sections, sects, base, ep, ResRva, ResSize, file, 0);

+}

+

+int cli_rebuildpe_align(char *buffer, struct cli_exe_section *sections, int sects, uint32_t base, uint32_t ep, uint32_t ResRva, uint32_t ResSize, int file, uint32_t align)

+{

   uint32_t datasize=0, rawbase=PESALIGN(0x148+0x80+0x28*sects, 0x200);

   char *pefile=NULL, *curpe;

   struct IMAGE_PE_HEADER *fakepe;

@@ -131,8 +136,12 @@ int cli_rebuildpe(char *buffer, struct cli_exe_section *sections, int sects, uin

   if(sects+gotghost > 96)

     return 0;

-  for (i=0; i < sects; i++)

-    datasize+=PESALIGN(sections[i].rsz, 0x200);

+  if (!align)

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

+      datasize+=PESALIGN(sections[i].rsz, 0x200);

+  else

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

+      datasize+=PESALIGN(PESALIGN(sections[i].rsz, align), 0x200);

   if(datasize > CLI_MAX_ALLOCATION)

     return 0;

@@ -163,10 +172,17 @@ int cli_rebuildpe(char *buffer, struct cli_exe_section *sections, int sects, uin

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

       snprintf(curpe, 8, ".clam%.2d", i+1);

-      cli_writeint32(curpe+8, sections[i].vsz);

-      cli_writeint32(curpe+12, sections[i].rva);

-      cli_writeint32(curpe+16, sections[i].rsz);

-      cli_writeint32(curpe+20, rawbase);

+      if (!align) {

+        cli_writeint32(curpe+8, sections[i].vsz);

+        cli_writeint32(curpe+12, sections[i].rva);

+        cli_writeint32(curpe+16, sections[i].rsz);

+        cli_writeint32(curpe+20, rawbase);

+      } else {

+        cli_writeint32(curpe+8, PESALIGN(sections[i].vsz, align));

+        cli_writeint32(curpe+12, PESALIGN(sections[i].rva, align));

+        cli_writeint32(curpe+16, PESALIGN(sections[i].rsz, align));

+        cli_writeint32(curpe+20, rawbase);

+      }

       /* already zeroed

       cli_writeint32(curpe+24, 0);

       cli_writeint32(curpe+28, 0);

@@ -174,9 +190,14 @@ int cli_rebuildpe(char *buffer, struct cli_exe_section *sections, int sects, uin

       */

       cli_writeint32(curpe+0x24, 0xffffffff);

       memcpy(pefile+rawbase, buffer+sections[i].raw, sections[i].rsz);

-      rawbase+=PESALIGN(sections[i].rsz, 0x200);

       curpe+=40;

-      datasize+=PESALIGN(sections[i].vsz, 0x1000);

+      if (!align) {

+        rawbase+=PESALIGN(sections[i].rsz, 0x200);

+        datasize+=PESALIGN(sections[i].vsz, 0x1000);

+      } else {

+        rawbase+=PESALIGN(PESALIGN(sections[i].rsz, align), 0x200);

+        datasize+=PESALIGN(PESALIGN(sections[i].vsz, align), 0x1000);

+      }

     }

     fakepe->SizeOfImage = EC32(datasize);

   } else {

@@ -25,5 +25,6 @@

 #include "execs.h"

 int cli_rebuildpe(char *, struct cli_exe_section *, int, uint32_t, uint32_t, uint32_t, uint32_t, int);

+int cli_rebuildpe_align(char *, struct cli_exe_section *, int, uint32_t, uint32_t, uint32_t, uint32_t, int, uint32_t);

 #endif