Fix confusion when recursing to multipart/related

git-svn: trunk@2857
19 years ago · 99f7771b86
parent ef38c83d47
commit 99f7771b86
2 changed files with 6 additions and 3 deletions
--- a/4
+++ b/4
@ -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
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
@ -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;
 					}
 				}