@@ -470,9 +470,12 @@ static int read_tables(int fd, unpack_data_t *unpack_data)

 				n = (rar_getbits(unpack_data) >> 9) + 11;

 				rar_addbits(unpack_data, 7);

 			}

+			if (i == 0) {

+				rar_dbgmsg("We cannot have repeat previous code at the first position");

+				return FALSE;

+			}

 			while (n-- > 0 && i < table_size) {

-				if (i>0)

-					table[i] = table[i-1];

+				table[i] = table[i-1];

 				i++;

 			}

 		} else {

@@ -116,9 +116,12 @@ static int read_tables20(int fd, unpack_data_t *unpack_data)

 		} else if (number == 16) {

 			n = (rar_getbits(unpack_data) >> 14) + 3;

 			rar_addbits(unpack_data, 2);

+			if (i == 0) {

+				/* We cannot have "repeat previous" code at the first position */

+				return FALSE;

+			}

 			while ((n-- > 0) && (i < table_size)) {

-				if (i>0)

-					table[i] = table[i-1];

+				table[i] = table[i-1];

 				i++;

 			}

 		} else {