if StrBuf_ServGetln() is called in a loop, its return value has to be checked for...

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 1ae3693fde75cdf7070e72aff6164920e28fad55..b20186ba0646c72fc4ac6af1935a43919dbe8219 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -547,8 +547,10 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
        Msg = (message_summary*)malloc(sizeof(message_summary));
        memset(Msg, 0, sizeof(message_summary));
        while (len = StrBuf_ServGetln(Buf),
+              (len >= 0) && 
               ((len != 3)  ||
-               strcmp(ChrPtr(Buf), "000")== 0)){
+               strcmp(ChrPtr(Buf), "000")))
+       {
                buf = ChrPtr(Buf);
                ebuf = strchr(ChrPtr(Buf), '=');
                nBuf = ebuf - buf;
@@ -599,7 +601,10 @@ int load_msg_ptrs(const char *servcmd,
                return (Stat->nummsgs);
        }
        Buf2 = NewStrBuf();
-       while (len = StrBuf_ServGetln(Buf), ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0))
+       while (len = StrBuf_ServGetln(Buf), 
+              ((len >= 0) &&
+               ((len != 3) || 
+                strcmp(ChrPtr(Buf), "000")!= 0)))
        {
                if (Stat->nummsgs < Stat->maxload) {
                        skipit = 0;
@@ -1013,7 +1018,7 @@ void post_message(void)
                memset(att, 0, sizeof(wc_mime_attachment ));
                att->length = WCC->upload_length;
                att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
-               att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
+               att->FileName = NewStrBufDup(WCC->upload_filename);
                
                if (WCC->attachments == NULL) {
                        WCC->attachments = NewHash(1, Flathash);
@@ -1233,6 +1238,7 @@ void post_message(void)
                                return;
                        }
                }
+               FreeStrBuf(&Recp);
                FreeStrBuf(&Buf);
                FreeStrBuf(&Cc);
                FreeStrBuf(&Bcc);