@@ -1670,9 +1670,10 @@ static uint8_t *disasm_x86(uint8_t *command, unsigned int len, struct DISASMED *

 }

-void disasmbuf(uint8_t *buff, unsigned int len, int fd) {

+int disasmbuf(uint8_t *buff, unsigned int len, int fd) {

   uint8_t *next = buff;

   unsigned int counter=0;

+  int gotsome=0;

   struct DISASMED s;

   struct MARIO {

     uint16_t real_op;

@@ -1691,7 +1692,7 @@ void disasmbuf(uint8_t *buff, unsigned int len, int fd) {

     int i;

     if(!(next = disasm_x86(next, len, &s))) {

       /* TODO: invd opcode or buff over */

-      return;

+      return gotsome;

     }

     if(cli_debug_flag) {

       char hr[128];

@@ -1726,6 +1727,8 @@ void disasmbuf(uint8_t *buff, unsigned int len, int fd) {

       }

     }

     cli_writen(fd, &w, sizeof(w));

+    gotsome = 1;

   }

+  return gotsome;

 }

@@ -27,6 +27,6 @@

 #include "others.h"

-void disasmbuf(uint8_t *, unsigned int, int);

+int disasmbuf(uint8_t *, unsigned int, int);

 #endif

@@ -537,6 +537,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

 	ret = CL_CLEAN;

     nsis_shutdown(&nsist);

+    fmunmap(nsist.map);

     if(!ctx->engine->keeptmp)

         cli_rmdirs(nsist.dir);

@@ -978,8 +978,8 @@ int cli_scanpe(cli_ctx *ctx)

     epsize = fmap_readn(map, epbuff, ep, 4096);

     CLI_UNPTEMP("DISASM",(exe_sections,0));

-    disasmbuf((unsigned char*)epbuff, epsize, ndesc);

-    ret = cli_scandesc(ndesc, ctx, CL_TYPE_PE_DISASM, 1, NULL, AC_SCAN_VIR);

+    if(disasmbuf((unsigned char*)epbuff, epsize, ndesc))

+	ret = cli_scandesc(ndesc, ctx, CL_TYPE_PE_DISASM, 1, NULL, AC_SCAN_VIR);

     close(ndesc);

     CLI_TMPUNLK();

     free(tempfile);

@@ -1428,11 +1428,6 @@ int cli_scanpe(cli_ctx *ctx)

 	    break;

 	}

-	if((src = (char *) cli_malloc(ssize)) == NULL) {

-	    free(exe_sections);

-	    return CL_EMEM;

-	}

-

 	if(!exe_sections[i + 1].rsz || !(src = fmap_need_off_once(map, exe_sections[i + 1].raw, ssize))) {

 	    cli_dbgmsg("Can't read raw data of section %d\n", i + 1);

 	    free(exe_sections);

@@ -1672,12 +1667,6 @@ int cli_scanpe(cli_ctx *ctx)

 	    sections[t+1].rva = (((support[t*2]|(support[t*2+1]<<8))-2)<<12)-EC32(optional_hdr32.ImageBase);

 	}

-	if((src = (char *) cli_malloc(ssize)) == NULL) {

-	    free(exe_sections);

-	    free(sections);

-	    return CL_EMEM;

-	}

-

 	if(!exe_sections[i + 1].rsz || !(src = fmap_need_off_once(map, exe_sections[i + 1].raw, ssize))) {

 	    cli_dbgmsg("FSG: Can't read raw data of section %d\n", i);

 	    free(exe_sections);