[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 1c7c61941cefb7308c3db87ad9a0c8dbf04e2bdd
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Mar 24 00:07:17 2010 +0200

    Fix GEPZ.

diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index fd8315a..e7b3a7f 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -1593,6 +1593,7 @@ static int cli_bytecode_prepare_interpreter(struct cli_bc *bc)
 	    assert(align);
 	    bcfunc->numBytes  = (bcfunc->numBytes + align-1)&(~(align-1));
 	    map[j] = bcfunc->numBytes;
+	    //printf("%d -> %d, %u\n", j, map[j], typesize(bc, ty));
 	    bcfunc->numBytes += typesize(bc, ty);
 	}
 	bcfunc->numBytes = (bcfunc->numBytes + 7)&~7;
diff --git a/libclamav/bytecode_vm.c b/libclamav/bytecode_vm.c
index 8b9464a..d5226e3 100644
--- a/libclamav/bytecode_vm.c
+++ b/libclamav/bytecode_vm.c
@@ -962,9 +962,9 @@ int cli_vm_execute(const struct cli_bc *bc, struct cli_bc_ctx *ctx, const struct
 		int64_t ptr;
 		if (!(inst->interp_op%5)) {
 		    WRITE64(inst->dest, ptr_compose(stackid,
-						    inst->u.unaryop));
+						    inst->u.three[1]));
 		} else {
-		    READ64(ptr, inst->u.unaryop);
+		    READ64(ptr, inst->u.three[1]);
 		    WRITE64(inst->dest, ptr);
 		}
 		break;

-- 
Debian repository for ClamAV