[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 cfb0aef1137f5300105ca406bab3f7119355cbf4
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Mar 24 10:51:05 2010 +0200

    OP_BC_COPY again.

diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index 527bbed..17936ca 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -1156,7 +1156,7 @@ static int parseBB(struct cli_bc *bc, unsigned func, unsigned bb, unsigned char
 		}
 	}
 	if (inst.opcode == OP_BC_COPY)
-	    inst.type = bcfunc->types[inst.u.binop[0]];
+	    inst.type = bcfunc->types[inst.u.binop[0]]&0x7fff;
 	if (!ok) {
 	    cli_errmsg("Invalid instructions or operands\n");
 	    return CL_EMALFDB;
diff --git a/libclamav/bytecode_api_decl.c b/libclamav/bytecode_api_decl.c
index 078013b..a14feae 100644
--- a/libclamav/bytecode_api_decl.c
+++ b/libclamav/bytecode_api_decl.c
@@ -89,7 +89,7 @@ const struct cli_apiglobal cli_globals[] = {
 /* Bytecode globals END */
 };
 const unsigned cli_apicall_maxglobal = _LAST_GLOBAL-1;
-static uint16_t cli_tmp0[]={32, 32, 16, 74, 73, 72, 70, 32, 32, 32, 32};
+static uint16_t cli_tmp0[]={32, 32, 16, 16, 74, 73, 32, 72, 70, 32, 32, 32, 32};
 static uint16_t cli_tmp1[]={71};
 static uint16_t cli_tmp2[]={32, 32};
 static uint16_t cli_tmp3[]={16, 8, 8, 32, 32, 32, 32, 32, 64, 32, 32, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 16, 16, 64, 64, 64, 64, 32, 32, 70};
@@ -116,7 +116,7 @@ static uint16_t cli_tmp23[]={93};
 static uint16_t cli_tmp24[]={8};
 
 const struct cli_bc_type cli_apicall_types[]={
-	{DStructType, cli_tmp0, 11, 0, 0},
+	{DStructType, cli_tmp0, 13, 0, 0},
 	{DArrayType, cli_tmp1, 16, 0, 0},
 	{DStructType, cli_tmp2, 2, 0, 0},
 	{DStructType, cli_tmp3, 30, 0, 0},

-- 
Debian repository for ClamAV