fix buffer overrun

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 516041eab49b9fdc0df399dd3b9e1e39bc0bacaa..5bfc364e5266bb6ad69184462e6443d625bbc605 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -623,8 +623,9 @@ void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharse
                Buf = NewStrBuf();
                /** If it's my vCard I can edit it */
                if (    (!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
-                       || (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM))
-                       || (WC->CurRoom.view == VIEW_ADDRESSBOOK)
+                       || ((StrLength(WCC->CurRoom.name) > 11) &&
+                           (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM)))
+                       || (WCC->CurRoom.view == VIEW_ADDRESSBOOK)
                        ) {
                        StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
                                Mime->msgnum, ChrPtr(Mime->PartNum));
@@ -1215,7 +1216,6 @@ void render_MAIL_markdown(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCha
                        FreeStrBuf(&Mime->Data);
                        Mime->Data = NewStrBufPlain(md_as_html, -1);
                }
-//     free(md_as_html);
                mkd_cleanup(doc);
        }
 }