@@ -669,11 +669,7 @@ static int add_vm_code(unpack_data_t *unpack_data, unsigned int first_byte,

 		    return FALSE;

 		}

 		for (i=0 ; i < (size_t) vm_codesize ; i++) {

-			if ((rarvm_input.in_addr + 2) < rarvm_input.buf_size) {

-				vm_code[i] = rarvm_getbits(&rarvm_input) >> 8;

-			} else {

-				vm_code[i] = 0;

-			}

+			vm_code[i] = rarvm_getbits(&rarvm_input) >> 8;

 			rarvm_addbits(&rarvm_input, 8);

 		}

 		if(!rarvm_prepare(&unpack_data->rarvm_data, &rarvm_input, &vm_code[0], (int) vm_codesize, &filter->prg)) {

@@ -837,6 +833,8 @@ void rar_unpack_init_data(int solid, unpack_data_t *unpack_data)

 		unpack_data->old_dist_ptr= 0;

 		memset(unpack_data->unp_old_table, 0, sizeof(unpack_data->unp_old_table));

 		memset(&unpack_data->LDD, 0, sizeof(unpack_data->LDD));

+		memset(&unpack_data->LD, 0, sizeof(unpack_data->LD));

+		memset(&unpack_data->DD, 0, sizeof(unpack_data->DD));

 		memset(&unpack_data->RD, 0, sizeof(unpack_data->RD));

 		memset(&unpack_data->BD, 0, sizeof(unpack_data->BD));

 		unpack_data->last_dist= 0;

@@ -847,8 +845,6 @@ void rar_unpack_init_data(int solid, unpack_data_t *unpack_data)

 		unpack_data->unp_block_type = BLOCK_LZ;

 		rar_init_filters(unpack_data);

 	}

-	memset(&unpack_data->LD, 0, sizeof(unpack_data->LD));

-	memset(&unpack_data->DD, 0, sizeof(unpack_data->DD));

 	unpack_data->in_bit = 0;

 	unpack_data->in_addr = 0;

 	unpack_data->read_top = 0;

@@ -341,13 +341,26 @@ int rar_unpack20(int fd, int solid, unpack_data_t *unpack_data)

 			continue;

 		}

 		if (number > 269) {

-			length = ldecode[number-=270]+3;

+			/* If number is higher or equal to 298 in this instance something has likely

+			 * gone horribly wrong and/or this is a RAR 5 file that Clam does not yet

+			 * support parsing. Either way, this is a total failure case. */

+			if (number < 298) {

+				length = ldecode[number-=270]+3;

+			} else {

+				retval = FALSE;

+				break;

+			}

+

 			if ((bits = lbits[number]) > 0) {

 				length += rar_getbits(unpack_data) >> (16-bits);

 				rar_addbits(unpack_data, bits);

 			}

 			dist_number = rar_decode_number(unpack_data, (struct Decode *)&unpack_data->DD);

+			if (dist_number > 47 || dist_number < 0) {

+				retval = FALSE;

+				break;

+			}

 			distance = ddecode[dist_number] + 1;

 			if ((bits = dbits[dist_number]) > 0) {

 				distance += rar_getbits(unpack_data)>>(16-bits);