[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 74f0e7df45dd2dfd2ccac5c473fa57245c0574a1
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:48 2008 +0100

    Revert "sync to trunk"
    
    This reverts commit fcda0a022a5f174a607c6b266e480804c3b4b8fb.

diff --git a/ChangeLog b/ChangeLog
index 5b42aef..34579cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-Sun Apr  6 12:33:25 CEST 2008 (acab)
-------------------------------------
-  * libclamav/pe.c: make petite softfail as it's really reading unaligned data
-  
-Sun Apr  6 12:19:47 CEST 2008 (acab)
-------------------------------------
-  * libclamav/pe.c: make upack softfail as it's really reading unaligned data
-
 Thu Apr  3 13:52:19 CEST 2008 (tk)
 ----------------------------------
   * libclamav/mspack.c: fix possible infinite loop introduced in r3717 (bb#899)
diff --git a/libclamav/pe.c b/libclamav/pe.c
index a7259b6..a69826c 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -1256,8 +1256,9 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 	    lseek(desc, 0, SEEK_SET);
 	    if(read(desc, dest, ssize) != ssize) {
 	        cli_dbgmsg("Upack: Can't read raw data of section 0\n");
+		free(exe_sections);
 		free(dest);
-		break;
+		return CL_EIO;
 	    }
 
 	    if(upack) memmove(dest + exe_sections[2].rva - exe_sections[0].rva, dest, ssize);
@@ -1266,8 +1267,9 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 
 	    if(read(desc, dest + exe_sections[1].rva - off, exe_sections[1].ursz) != exe_sections[1].ursz) {
 		cli_dbgmsg("Upack: Can't read raw data of section 1\n");
+		free(exe_sections);
 		free(dest);
-		break;
+		return CL_EIO;
 	    }
 
 	    CLI_UNPTEMP("Upack",(dest,exe_sections,0));
@@ -1792,7 +1794,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 		    if(!cli_seeksect(desc, &exe_sections[i]) || (unsigned int) cli_readn(desc, dest + exe_sections[i].rva - min, exe_sections[i].ursz) != exe_sections[i].ursz) {
 			free(exe_sections);
 			free(dest);
-			return CL_CLEAN;
+			return CL_EIO;
 		    }
 		}
 	    }

-- 
Debian repository for ClamAV