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

+Thu Mar  1 11:24:40 GMT 2007 (trog)

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

+  * libclamav/unrar/unrar.c, unrarvm.c: better fix for bb#350

+

 Thu Mar  1 11:43:07 CET 2007 (tk)

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

   * libclamav/unrar/unrar.c: skip all files inside multi-volume solid archives

@@ -1501,6 +1501,7 @@ int cli_unrar_open(int fd, const char *dirname, rar_state_t* state)

 					unpack_data->dest_unp_size = comment_header->unpack_size;

 					unpack_data->pack_size = comment_header->head_size - SIZEOF_COMMHEAD;

                         		retval = rar_unpack(fd, comment_header->unpack_ver, FALSE, unpack_data);

+					unpack_free_data(unpack_data);

 				}

 				close(ofd);

 			}

@@ -139,7 +139,7 @@ void rarvm_set_value(int byte_mode, unsigned int *addr, unsigned int value)

 uint32_t crc_tab[256];

-static void init_crc()

+static void rar_crc_init()

 {

 	int i, j;

 	unsigned int c;

@@ -190,11 +190,8 @@ uint32_t rar_crc(uint32_t start_crc, void *addr, uint32_t size)

 int rarvm_init(rarvm_data_t *rarvm_data)

 {

-	if(rarvm_data->mem) {

-		free(rarvm_data->mem);/* prevent leaks */

-	}

 	rarvm_data->mem = (uint8_t *) cli_malloc(RARVM_MEMSIZE+4);

-	init_crc();

+	rar_crc_init();

 	if (!rarvm_data->mem) {

 		return FALSE;

 	}