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

+Wed Nov 10 16:31:49 CET 2010 (acab)

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

+ * libclamav: Set the unreliability flag on (un)packed files (bb#2307)

+

 Sat Nov  6 15:47:01 EET 2010 (edwin)

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

  * libclamav/c++: Update embedded copy of LLVM to version 2.8 (bb #2327)

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

 	    }

     }

+

+    /* !!!!!!!!!!!!!!    PACKERS START HERE    !!!!!!!!!!!!!! */

+    ctx->corrupted_input = 2; /* caller will reset on return */

+

+

     /* UPX, FSG, MEW support */

     /* try to find the first section with physical size == 0 */

@@ -2356,8 +2356,11 @@ static int magic_scandesc(int desc, cli_ctx *ctx, cli_file_t type)

 	 * in raw mode. Now we will try to unpack them

 	 */

 	case CL_TYPE_MSEXE:

-	    if(SCAN_PE && ctx->dconf->pe)

+	    if(SCAN_PE && ctx->dconf->pe) {

+		unsigned int corrupted_input = ctx->corrupted_input;

 		ret = cli_scanpe(ctx);

+		ctx->corrupted_input = corrupted_input;

+	    }

 	    break;

 	default:

 	    break;