X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;fp=citadel%2Fmsgbase.c;h=f44dfe66cb339cc3662ce65f8d798aa2b9cc9a05;hp=f93788e7855d592dc49e13dff2e8335677b282f8;hb=a8bb950b3da00b7933912c27e2ad92814b10d75b;hpb=f7a98d7d85704408287afd82e1f26c7fb213a04d

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index f93788e78..f44dfe66c 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3618,7 +3618,7 @@ void flood_protect_quickie_message(const char *from,
 StrBuf *CtdlReadMessageBodyBuf(char *terminator,	/* token signalling EOT */
 			       long tlen,
 			       size_t maxlen,		/* maximum message length */
-			       char *exist,		/* if non-null, append to it;
+			       StrBuf *exist,		/* if non-null, append to it;
 							   exist is ALWAYS freed  */
 			       int crlf,		/* CRLF newlines instead of LF */
 			       int *sock		/* socket handle or 0 for this session's client socket */
@@ -3635,8 +3635,7 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator,	/* token signalling EOT */
 		Message = NewStrBufPlain(NULL, 4 * SIZ);
 	}
 	else {
-		Message = NewStrBufPlain(exist, -1);
-		free(exist);
+		Message = NewStrBufDup(exist);
 	}
 
 	/* Do we need to change leading ".." to "." for SMTP escaping? */
@@ -3699,7 +3698,7 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator,	/* token signalling EOT */
 			  long tlen,
 			  size_t maxlen,		/* maximum message length */
 			  size_t expectlen,             /* if we expect a message, how long should it be? */
-			  char *exist,			/* if non-null, append to it;
+			  StrBuf *exist,		/* if non-null, append to it;
 						   	   exist is ALWAYS freed  */
 			  long eLen,            	/* length of exist */
 			  int crlf			/* CRLF newlines instead of LF */
@@ -3722,8 +3721,7 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator,	/* token signalling EOT */
 		NewMsg->MsgBuf = NewStrBufPlain(NULL, len);
 	}
 	else {
-		NewMsg->MsgBuf = NewStrBufPlain(exist, eLen);
-		free(exist);
+		NewMsg->MsgBuf = NewStrBufDup(exist);
 	}
 	/* Do we need to change leading ".." to "." for SMTP escaping? */
 	if ((tlen == 1) && (*terminator == '.')) {
@@ -3856,7 +3854,7 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO)
 char *CtdlReadMessageBody(char *terminator,	/* token signalling EOT */
 			  long tlen,
 			  size_t maxlen,		/* maximum message length */
-			  char *exist,		/* if non-null, append to it;
+			  StrBuf *exist,		/* if non-null, append to it;
 						   exist is ALWAYS freed  */
 			  int crlf,		/* CRLF newlines instead of LF */
 			  int *sock		/* socket handle or 0 for this session's client socket */