@@ -1,3 +1,8 @@

+Thu Nov  3 22:46:21 CET 2005 (tk)

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

+  * libclamav/mspack/cabd.c: fix possible infinite loop in cabd_find

+			     Reported by iDEFENSE (IDEF1180)

+

 Thu Nov  3 22:44:00 CET 2005 (tk)

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

   * libclamav/tnef.c: fix possible infinite loop

@@ -827,7 +827,9 @@ static int cabd_find(struct mscab_decompressor_p *this, unsigned char *buf,

 	    /* cause the search to restart after this cab's data. */

 	    offset = caboff + cablen;

-	      

+	    if (!offset)

+		return MSPACK_ERR_DATAFORMAT;

+

 	    /* link the cab into the list */

 	    if (!link) *firstcab = cab;

 	    else link->base.next = (struct mscabd_cabinet *) cab;