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

+Fri May 14 11:28:52 EEST 2010 (edwin)

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

+ * libclamav/bytecode.c: handle global gep parameter correctly (bb #1955)

+

 Thu May 13 23:40:11 EEST 2010 (edwin)

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

  * libclamav/c++/llvm: Update to LLVM 2.7 release.

@@ -1852,7 +1852,8 @@ static int cli_bytecode_prepare_interpreter(struct cli_bc *bc)

 		    MAPPTR(inst->u.unaryop);

 		    break;

 		case OP_BC_GEP1:

-		    if (bcfunc->types[inst->u.binop[1]]&0x8000) {

+		    if (inst->u.three[1]&0x80000000 ||

+			bcfunc->types[inst->u.binop[1]]&0x8000) {

                       cli_errmsg("bytecode: gep1 of alloca is not allowed\n");

                       return CL_EBYTECODE;

                     }

@@ -1864,7 +1865,8 @@ static int cli_bytecode_prepare_interpreter(struct cli_bc *bc)

                     break;

 		case OP_BC_GEPZ:

 		    /*three[0] is the type*/

-		    if (bcfunc->types[inst->u.three[1]]&0x8000)

+		    if (inst->u.three[1]&0x80000000 ||

+			bcfunc->types[inst->u.three[1]]&0x8000)

 			inst->interp_op = 5*(inst->interp_op/5);

 		    else

 			inst->interp_op = 5*(inst->interp_op/5)+3;