fix possible crashes of not NULL-checking the result of icalproperty_get_attendee()

[citadel.git] / webcit / availability.c

diff --git a/webcit/availability.c b/webcit/availability.c
index 67b5139d3f03057b091aee5ab931452a3e944f53..d6949b6d6502424b84fc033b1812a359a6780737 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -1,11 +1,27 @@
 /*
  * $Id$
  *
+ * Copyright (c) 1996-2010 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
 #include "webcit.h"
 #include "webserver.h"
+#include "calendar.h"
 
 /*
  * Utility function to fetch a VFREEBUSY type of thing for any specified user.
@@ -195,6 +211,7 @@ void check_attendee_availability(icalcomponent *vevent) {
        char attendee_string[SIZ];
        char annotated_attendee_string[SIZ];
        char annotation[SIZ];
+       const char *ch;
 
        if (vevent == NULL) {
                return;
@@ -234,12 +251,11 @@ void check_attendee_availability(icalcomponent *vevent) {
        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY);
            attendee != NULL;
            attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
-
-               strcpy(attendee_string, icalproperty_get_attendee(attendee));
-               if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+               ch = icalproperty_get_attendee(attendee);
+               if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
 
                        /** screen name or email address */
-                       strcpy(attendee_string, &attendee_string[7]);
+                       safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
                        striplt(attendee_string);
 
                        check_individual_attendee(attendee_string,