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

+Sat Jun 12 15:29:37 CEST 2004 (tk)

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

+  * libclamav: ole2_extract: fix segfault when mmap() fails (problem reported

+	       by Mehmet Ekiz <ekizm*tbmm.gov.tr>)

+

 Sat Jun 12 02:51:42 CEST 2004 (tk)

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

   * contrib/trashscan: removed due to security reasons:

@@ -714,9 +714,10 @@ int cli_ole2_extract(int fd, const char *dirname)

 		hdr.m_area = (unsigned char *) mmap(NULL, hdr.m_length, PROT_READ, MAP_PRIVATE, fd, 0);

 		if (hdr.m_area == MAP_FAILED) {

 			hdr.m_area = NULL;

+		} else {

+			cli_dbgmsg("mmap'ed file\n");

+			memcpy(&hdr, hdr.m_area, hdr_size);

 		}

-		cli_dbgmsg("mmap'ed file\n");

-		memcpy(&hdr, hdr.m_area, hdr_size);

 	}

 #endif