projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Protect precious strlens, as pointed out by John Goerzen
[citadel.git]
/
citadel
/
modules
/
calendar
/
serv_calendar.c
diff --git
a/citadel/modules/calendar/serv_calendar.c
b/citadel/modules/calendar/serv_calendar.c
index 5fb86a2287fb12512fce7ecc532ce3fe34458358..8fc0dbad1e351f3457a1a2a0d43942bf2dcfe4e7 100644
(file)
--- a/
citadel/modules/calendar/serv_calendar.c
+++ b/
citadel/modules/calendar/serv_calendar.c
@@
-906,11
+906,11
@@
int ical_conflicts_phase6(struct icaltimetype t1start,
existing_msgnum,
conflict_event_uid,
conflict_event_summary,
- ( (
(strlen(compare_uid)>0
)
+ ( (
!IsEmptyStr(compare_uid
)
&&(!strcasecmp(compare_uid,
conflict_event_uid))) ? 1 : 0
- )
- );
+
)
+
);
conflict_reported = 1;
}