http_caldav: caldav_put() ensure ORGANIZER is consistent

Fixes #1768
cyrusimap · Jan 10, 2017 · 74b69d2 · 74b69d2
1 parent 592bffd
commit 74b69d2
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/imap/http_caldav.c b/imap/http_caldav.c
@@ -3952,17 +3952,16 @@ static int caldav_put(struct transaction_t *txn, void *obj,
             goto done;
         }
 
-        if (organizer) {
-            const char *nextorg = NULL;
-
-            prop = icalcomponent_get_first_property(nextcomp,
-                                                    ICAL_ORGANIZER_PROPERTY);
-            if (prop) nextorg = icalproperty_get_organizer(prop);
-            if (!nextorg || strcmp(organizer, nextorg)) {
-                txn->error.precond = CALDAV_SAME_ORGANIZER;
-                ret = HTTP_FORBIDDEN;
-                goto done;
-            }
+        const char *nextorg = NULL;
+
+        prop = icalcomponent_get_first_property(nextcomp,
+                                                ICAL_ORGANIZER_PROPERTY);
+        if (prop) nextorg = icalproperty_get_organizer(prop);
+        if ( (!organizer && nextorg)
+             || (organizer && (!nextorg || strcmp(organizer, nextorg)))) {
+            txn->error.precond = CALDAV_SAME_ORGANIZER;
+            ret = HTTP_FORBIDDEN;
+            goto done;
         }
 
         if (rscale_calendars && !rrule) {