From bc4eb7853aedc138e81346a43b7d9bfee601e81c Mon Sep 17 00:00:00 2001
From: pfelt <pfelt@52461e19-6027-0410-9301-c4706890ca92>
Date: Sat, 11 Jun 2011 18:47:57 +0000
Subject: [PATCH] -- patch mail.c to better check for error conditions on pipe
 creation

---
 src/agents/store/mail.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/agents/store/mail.c b/src/agents/store/mail.c
index 2009979..90db6a3 100644
--- a/src/agents/store/mail.c
+++ b/src/agents/store/mail.c
@@ -109,7 +109,11 @@ StoreProcessIncomingMail(StoreClient *client,
 		}
 
 		/* create the wrapper for the child side */
-		Connection *cpipe = ConnAlloc(TRUE);
+		Connection *cpipe = NULL;
+		cpipe = ConnAlloc(TRUE);
+		if (!cpipe) {
+			goto threadcleanup;
+		}
 		cpipe->socket = commsPipe[1];
 		
 		while (headers->header != NULL) {
@@ -145,13 +149,19 @@ StoreProcessIncomingMail(StoreClient *client,
 			g_free(header_str);
 		}
 		
+		threadcleanup:
+
 		// all done, we can quit now
 		// FIXME: Why does this crash? : g_object_unref(message);
-		close(fd);
+		if (fd > 0) {
+			close(fd);
+		}
 
 		/* clean up */
-		ConnClose(cpipe);
-		ConnFree(cpipe);
+		if (cpipe) {
+			ConnClose(cpipe);
+			ConnFree(cpipe);
+		}
 
 		exit(0);
 	}
@@ -159,7 +169,11 @@ StoreProcessIncomingMail(StoreClient *client,
 	waitpid(childpid, NULL, 0);
 	
 	int nbytes;
-	Connection *spipe = ConnAlloc(TRUE);
+	Connection *spipe = NULL;
+	spipe = ConnAlloc(TRUE);
+	if (!spipe) {
+		goto finish;
+	}
 	spipe->socket = commsPipe[0];
 	
 	// from here, we're the parent - need to get the results from the
@@ -240,8 +254,10 @@ StoreProcessIncomingMail(StoreClient *client,
 	
 finish:
 	if (message_subject) MemFree(message_subject);
-	ConnClose(spipe);
-	ConnFree(spipe);
+	if (spipe) {
+		ConnClose(spipe);
+		ConnFree(spipe);
+	}
 	
 	return result;
 }