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

+Sat Feb 24 11:44:34 GMT 2007 (njh)

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

+  * libclamav/mbox.c:	Fix confusion when recursing to multipart/related

+

 Sat Feb 24 02:32:57 CET 2007 (tk)

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

   * configure, libclamav: add support for HP-UX 11.11 with native

@@ -2637,10 +2637,9 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 					cli_dbgmsg("No HTML code found to be scanned\n");

 				else {

 					rc = parseEmailBody(aMessage, aText, mctx, recursion_level + 1);

-					if(rc == OK) {

+					if((rc == OK) && aMessage) {

 						assert(aMessage == messages[htmltextPart]);

-						if(aMessage)

-							messageDestroy(aMessage);

+						messageDestroy(aMessage);

 						messages[htmltextPart] = NULL;

 					}

 				}