X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=824b51bd337974b232da9bd2644ccaed22db1085;hb=6e2775961a4c77515aec8718b18f375497678696;hp=c583263eb4ebc19220aa72a3660637dcff0ca1b6;hpb=79b223cc3fa9d72e4b202b1e5a32adcb53210c37;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index c583263eb..824b51bd3 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1084,26 +1084,37 @@ void mime_download(char *name, char *filename, char *partnum, char *disp,
 		   char *encoding, char *cbid, void *cbuserdata)
 {
 	int rv = 0;
+	CitContext *CCC = MyContext();
 
 	/* Silently go away if there's already a download open. */
-	if (CC->download_fp != NULL)
+	if (CCC->download_fp != NULL)
 		return;
 
 	if (
-		(!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
-	||	(!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
+		(!IsEmptyStr(partnum) && (!strcasecmp(CCC->download_desired_section, partnum)))
+	||	(!IsEmptyStr(cbid) && (!strcasecmp(CCC->download_desired_section, cbid)))
 	) {
-		CC->download_fp = tmpfile();
-		if (CC->download_fp == NULL)
+		CCC->download_fp = tmpfile();
+		if (CCC->download_fp == NULL) {
+			syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
+			       strerror(errno));
+			cprintf("%d cannot open temporary file: %s\n",
+				ERROR + INTERNAL_ERROR, strerror(errno));
 			return;
+		}
 	
 		rv = fwrite(content, length, 1, CC->download_fp);
-		if (rv == -1) {
+		if (rv <= 0) {
 			syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
 			       strerror(errno));
+			cprintf("%d unable to write tempfile.\n",
+				ERROR + TOO_BIG);
+			fclose(CCC->download_fp);
+			CCC->download_fp = NULL;
+			return;
 		}
-		fflush(CC->download_fp);
-		rewind(CC->download_fp);
+		fflush(CCC->download_fp);
+		rewind(CCC->download_fp);
 	
 		OpenCmdResult(filename, cbtype);
 	}
@@ -1239,26 +1250,28 @@ int is_valid_message(struct CtdlMessage *msg) {
 	return 1;
 }
 
+void CtdlFreeMessageContents(struct CtdlMessage *msg)
+{
+	int i;
 
+	for (i = 0; i < 256; ++i)
+		if (msg->cm_fields[i] != NULL) {
+			free(msg->cm_fields[i]);
+		}
+
+	msg->cm_magic = 0;	/* just in case */
+}
 /*
  * 'Destructor' for struct CtdlMessage
  */
 void CtdlFreeMessage(struct CtdlMessage *msg)
 {
-	int i;
-
 	if (is_valid_message(msg) == 0) 
 	{
 		if (msg != NULL) free (msg);
 		return;
 	}
-
-	for (i = 0; i < 256; ++i)
-		if (msg->cm_fields[i] != NULL) {
-			free(msg->cm_fields[i]);
-		}
-
-	msg->cm_magic = 0;	/* just in case */
+	CtdlFreeMessageContents(msg);
 	free(msg);
 }