Browse code

bb11941 - fixing UAF in mbox exportBounceMessage. Original patch submitted by Suleman Ali

Mickey Sola authored on 2017/10/31 05:39:54
Showing 1 changed files
... ...
@@ -2351,8 +2351,9 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
2351 2351
 		/*
2352 2352
 		 * Look for uu-encoded main file
2353 2353
 		 */
2354
-		if((encodingLine(mainMessage) != NULL) &&
2355
-		   ((t_line = bounceBegin(mainMessage)) != NULL))
2354
+		if(mainMessage->body_first != NULL &&
2355
+			(encodingLine(mainMessage) != NULL) &&
2356
+			((t_line = bounceBegin(mainMessage)) != NULL))
2356 2357
 			rc = (exportBounceMessage(mctx, t_line) == CL_VIRUS) ? VIRUS : OK;
2357 2358
 		else {
2358 2359
 			bool saveIt;