X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=089d50b23edee2a9d5b6e8a603cb26f88a3c65cd;hb=fe4ad631ada6d1c97bd16abf3ed39f6b25a0c6b6;hp=78fda6fa2b9873b649a05c0e44d01114fbf76950;hpb=ffe9ea29a8fd7dfeb7c89760fde32b3f53f19a50;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 78fda6fa2..089d50b23 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -116,6 +116,15 @@ char *msgkeys[] = {
 	NULL    /* Z */
 };
 
+void CtdlMsgSetCM_Fields(struct CtdlMessage *Msg, const char which, const char *buf, long length)
+{
+	if (Msg->cm_fields[which] != NULL)
+		free (Msg->cm_fields[which]);
+	Msg->cm_fields[which] = malloc(length + 1);
+	memcpy(Msg->cm_fields[which], buf, length);
+	Msg->cm_fields[which][length] = '\0';
+}
+
 /*
  * This function is self explanatory.
  * (What can I say, I'm in a weird mood today...)
@@ -1138,7 +1147,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp,
 			return;
 		}
 	
-		rv = fwrite(content, length, 1, CC->download_fp);
+		rv = fwrite(content, length, 1, CCC->download_fp);
 		if (rv <= 0) {
 			MSG_syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
 				   strerror(errno));
@@ -1320,6 +1329,7 @@ int DupCMField(int i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg)
 	if (NewMsg->cm_fields[i] == NULL)
 		return 0;
 	memcpy(NewMsg->cm_fields[i], OrgMsg->cm_fields[i], len);
+	NewMsg->cm_fields[i][len] = '\0';
 	return 1;
 }
 
@@ -1330,13 +1340,13 @@ struct CtdlMessage * CtdlDuplicateMessage(struct CtdlMessage *OrgMsg)
 
 	if (is_valid_message(OrgMsg) == 0) 
 		return NULL;
-	NewMsg = (struct CtdlMessage *)malloc(sizeof(struct CtdlMessage *));
+	NewMsg = (struct CtdlMessage *)malloc(sizeof(struct CtdlMessage));
 	if (NewMsg == NULL)
 		return NULL;
 
-	memcpy(NewMsg, OrgMsg, sizeof(struct CtdlMessage *));
+	memcpy(NewMsg, OrgMsg, sizeof(struct CtdlMessage));
 
-	memset(NewMsg->cm_fields, 0, sizeof(NewMsg->cm_fields));
+	memset(&NewMsg->cm_fields, 0, sizeof(char*) * 256);
 	
 	for (i = 0; i < 256; ++i)
 	{
@@ -3541,7 +3551,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
  */
 void quickie_message(const char *from,
 		     const char *fromaddr,
-		     char *to,
+		     const char *to,
 		     char *room,
 		     const char *text, 
 		     int format_type,
@@ -3588,7 +3598,7 @@ void quickie_message(const char *from,
 
 void flood_protect_quickie_message(const char *from,
 				   const char *fromaddr,
-				   char *to,
+				   const char *to,
 				   char *room,
 				   const char *text, 
 				   int format_type,