@@ -1,4 +1,10 @@

+Wed Aug 25 11:06:42 BST 2004 (trog)

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

+  * libclamac/ole2_extract.c: fix error path memory leaks

+	(thanks to acab and njh)

+

 Wed Aug 25 10:13:43 CEST 2004 (acab)

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

   * libclamav/petite.c: memory leaks fixed

 Tue Aug 24 13:47:07 CEST 2004 (tk)

@@ -604,6 +604,8 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 	ofd = open(newname, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

 	if (ofd < 0) {

+		cli_errmsg("ERROR: failed to create file: %s\n", newname);

+		free(newname);

 		return FALSE;

 	}

 	free(newname);

@@ -767,6 +769,11 @@ int cli_ole2_extract(int fd, const char *dirname, const struct cl_limits *limits

 	if (strncmp(hdr.magic, magic_id, 8) != 0) {

 		cli_dbgmsg("OLE2 magic failed!\n");

+#ifdef HAVE_MMAP

+		if (hdr.m_area != NULL) {

+			munmap(hdr.m_area, hdr.m_length);

+		}

+#endif

 		return CL_EOLE2;

 	}