X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar.c;h=7ddd3539174f37cd525d27846a08a3ce2269ff41;hb=8bb5d840a5e914328dcb75ea2ace4f84be3fa1fa;hp=9211b2bc05609d121740f44aaf1164ceb50ea1a9;hpb=051e2207e1e92eb715797656f63032aff0df10f4;p=citadel.git

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 9211b2bc0..7ddd35391 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -50,6 +50,7 @@ void cal_process_object(StrBuf *Target,
 	int is_update = 0;
 	char divname[32];
 	static int divcount = 0;
+	const char *ch;
 
 	sprintf(divname, "rsvp%04x", ++divcount);
 
@@ -184,11 +185,11 @@ void cal_process_object(StrBuf *Target,
 		StrBufAppendPrintf(Target, "<dt>");
 		StrBufAppendPrintf(Target, _("Attendee:"));
 		StrBufAppendPrintf(Target, "</dt><dd>");
-		safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
-		if (!strncasecmp(buf, "MAILTO:", 7)) {
+		ch = icalproperty_get_attendee(p);
+		if ((ch != NULL) && !strncasecmp(buf, "MAILTO:", 7)) {
 
 			/** screen name or email address */
-			strcpy(buf, &buf[7]);
+			safestrncpy(buf, ch + 7, sizeof(buf));
 			striplt(buf);
 			StrEscAppend(Target, NULL, buf, 0, 0);
 			StrBufAppendPrintf(Target, " ");