Fix for CVE-2008-1389, applied upstream in 0.94

svn diff -c 4157 http://svn.clamav.net/svn/clamav-devel/trunk/

diff -pruN clamav-0.93.3.orig/libclamav/chmunpack.c clamav-0.93.3/libclamav/chmunpack.c

--- clamav-0.93.3.orig/libclamav/chmunpack.c	2008-04-07 11:18:42.000000000 +0200

+++ clamav-0.93.3/libclamav/chmunpack.c	2008-11-13 17:50:49.000000000 +0100

@@ -449,7 +449,7 @@ static int read_chunk(chm_metadata_t *me

 	cli_dbgmsg("in read_chunk\n");

 	if (metadata->itsp_hdr.block_len < 8 || metadata->itsp_hdr.block_len > 33554432) {

-		return FALSE;

+		return CL_EFORMAT;

 	}

 	if (metadata->m_area != NULL) {

@@ -911,7 +911,9 @@ int cli_chm_open(int fd, const char *dir

 			cli_dbgmsg("read_chunk failed");

 			goto abort;

 		}

-		read_control_entries(metadata);

+		if (read_control_entries(metadata) == FALSE) {

+			goto abort;

+		}

 		metadata->num_chunks--;

 		metadata->chunk_offset += metadata->itsp_hdr.block_len;

 	}