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

+Sat Aug 26 23:41:08 CEST 2006 (tk)

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

+  * libclamav/mspack: fix double close of file descriptor, patch from NJH

+

 Fri Aug 25 21:23:59 CEST 2006 (tk)

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

   * freshclam/manager.c: "Cache-Control: no-cache" is now disabled by default.

@@ -685,12 +685,16 @@ static struct mscabd_cabinet *cabd_dsearch(struct mscab_decompressor *base,

   off_t filelen;

   char *filename = "descriptor";

-  if (!base) return NULL;

+  if (!base) {

+      close(desc);

+      return NULL;

+  }

   sys = this->system;

   /* allocate a search buffer */

   search_buf = sys->alloc(sys, (size_t) this->param[MSCABD_PARAM_SEARCHBUF]);

   if (!search_buf) {

+    close(desc);

     this->error = MSPACK_ERR_NOMEMORY;

     return NULL;

   }

@@ -724,6 +728,7 @@ static struct mscabd_cabinet *cabd_dsearch(struct mscab_decompressor *base,

   /* free the search buffer */

   sys->free(search_buf);

+  close(desc);

   return (struct mscabd_cabinet *) cab;

 }

@@ -140,8 +140,8 @@ static struct mspack_file *msp_dopen(struct mspack_system *this,

   if ((fh = cli_malloc(sizeof(struct mspack_file_p)))) {

     fh->name = "descriptor";

-    fh->desc = desc;

-    if ((fh->fh = fdopen(desc, fmode))) return (struct mspack_file *) fh;

+    fh->desc = dup(desc);

+    if ((fh->fh = fdopen(fh->desc, fmode))) return (struct mspack_file *) fh;

     free(fh);

   }

   return NULL;