X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=700e12288c8577e74df97c4d9c184b54ab9b168b;hp=ef7bdf8c0c9d397927d75641ca941a8aacc03b53;hb=4d7b86eab71baaed6a1953e4d1968a0988456661;hpb=1b855e76964287d01dcb0509418c1ad63a810587

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index ef7bdf8c0..700e12288 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3223,13 +3223,13 @@ void quickie_message(const char *from, const char *fromaddr, char *to, char *roo
 /*
  * Back end function used by CtdlMakeMessage() and similar functions
  */
-char *CtdlReadMessageBody(char *terminator,	/* token signalling EOT */
-			  long tlen,
-			size_t maxlen,		/* maximum message length */
-			char *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 */
+StrBuf *CtdlReadMessageBodyBuf(char *terminator,	/* token signalling EOT */
+			       long tlen,
+			       size_t maxlen,		/* maximum message length */
+			       char *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 */
 			) 
 {
 	StrBuf *Message;
@@ -3288,10 +3288,36 @@ char *CtdlReadMessageBody(char *terminator,	/* token signalling EOT */
 		if (StrLength(Message) >= maxlen) flushing = 1;
 
 	} while (!finished);
-	return SmashStrBuf(&Message);
+	FreeStrBuf(&LineBuf);
+	return Message;
 }
 
 
+/*
+ * Back end function used by CtdlMakeMessage() and similar functions
+ */
+char *CtdlReadMessageBody(char *terminator,	/* token signalling EOT */
+			  long tlen,
+			  size_t maxlen,		/* maximum message length */
+			  char *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 */
+	) 
+{
+	StrBuf *Message;
+
+	Message = CtdlReadMessageBodyBuf(terminator,
+					 tlen,
+					 maxlen,
+					 exist,
+					 crlf,
+					 sock);
+	if (Message == NULL)
+		return NULL;
+	else
+		return SmashStrBuf(&Message);
+}
 
 
 /*