@@ -1,3 +1,9 @@

+Thu Apr 28 08:52:05 BST 2005 (trog)

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

+  * libclamav/chmunpack.c: Add extra sanity check.

+

+  * libclamav/unrar/unrar20.c: Fix typo spotted by NJH.

+

 Wed Apr 27 23:54:46 CEST 2005 (tk)

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

   * libclamav/upx.c: add sanity check to pefromupx() (patch by NJH)

@@ -187,6 +187,9 @@ static uint64_t chm_endian_convert_64(uint64_t v)

 int chm_read_data(int fd, unsigned char *dest, off_t offset, off_t len,

 			unsigned char *m_area, off_t m_length)

 {

+	if ((offset < 0) || (len < 0) || ((offset+len) < 0)) {

+		return FALSE;

+	}

 	if (m_area != NULL) {

 		if ((offset+len) > m_length) {

 			return FALSE;

@@ -182,7 +182,7 @@ static unsigned char decode_audio(unpack_data_t *unpack_data, int delta)

 	pch = 8 * v->last_char + v->K1 * v->D1 + v->K2 * v->D2 + v->K3 *

 		v->D3 + v->K4 * v->D4 + v->K5 * unpack_data->unp_channel_delta;

-	pch - (pch >> 3) & 0xff;

+	pch = (pch >> 3) & 0xff;

 	ch = pch - delta;