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

+Wed Oct 13 20:21:26 CEST 2004 (tk)

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

+  * libclamav/mspack/cabd.c: fix possible description leak

+

 Wed Oct 13 11:19:03 BST 2004 (njh)

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

   * libclamav/untar.c:	Added handling of some extra file types within the

@@ -283,6 +283,10 @@ static void cabd_close(struct mscab_decompressor *base,

   struct mscabd_file *fi, *nfi;

   struct mspack_system *sys;

+

+  if(origcab->desc)

+      close(origcab->desc);

+

   if (!base) return;

   sys = this->system;

@@ -217,7 +217,7 @@ static void *msp_alloc(struct mspack_system *this, size_t bytes) {

   *((size_t *)buf) = bytes;

   return &buf[8];

 #else

-  return malloc(bytes);

+  return cli_calloc(bytes, 1);

 #endif

 }