Fixed bug in find_ep

git-svn: trunk@1996
19 years ago · fd9fb09150
parent da6d390546
commit fd9fb09150
2 changed files with 5 additions and 1 deletions
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@ -1,3 +1,7 @@
+Sun May 28 00:42:05 CEST 2006 (acab)
+------------------------------------
+  * libclamav/upx.c: Fixed upx bug in find_ep reported by Sven
+
 Sat May 27 15:37:51 BST 2006 (njh)
 ----------------------------------
  * libclamav:	Some debugging messages didn't print new lines, reported by Sven
--- a/clamav-devel/libclamav/upx.c
+++ b/clamav-devel/libclamav/upx.c
@ -216,7 +216,7 @@ static int upx_find_ep(char *src, uint32_t ssize, uint32_t upx1, uint32_t ep)

    /* Verify decompressor length. Avoid crashing on multiple 
     * compressed files. exe packed by UPX and PEC. */
-    if (!CLI_ISCONTAINED(src, ssize, src + ep - upx1, len))
+    if (!CLI_ISCONTAINED(src, ssize, src + ep - upx1 + 0xc0, len))
 	return -1;

    /* Shift to decompressor start */