From b6700a855b7ef270b65bcb4842465c202896e7d9 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 9 Jul 2013 10:03:11 +0300 Subject: [PATCH] cal: don't crash on HTTP request failure There is no error handling in the calendar state machines, so we simply skip the request. Not nice, but better than crashing. (cherry picked from commit d24948efc67efed4520db1f1e33b642255ef3708) --- src/core/sipe-domino.c | 8 +++++--- src/core/sipe-ews.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/core/sipe-domino.c b/src/core/sipe-domino.c index c6b35fe3..6bf3f772 100755 --- a/src/core/sipe-domino.c +++ b/src/core/sipe-domino.c @@ -306,9 +306,11 @@ sipe_domino_time_to_str(time_t timestamp) static void sipe_domino_send_http_request(struct sipe_calendar *cal) { - sipe_cal_http_authentication(cal); - sipe_http_request_session(cal->request, cal->session); - sipe_http_request_ready(cal->request); + if (cal->request) { + sipe_cal_http_authentication(cal); + sipe_http_request_session(cal->request, cal->session); + sipe_http_request_ready(cal->request); + } } static void sipe_domino_do_calendar_request(struct sipe_calendar *cal) diff --git a/src/core/sipe-ews.c b/src/core/sipe-ews.c index db503347..db21f94e 100644 --- a/src/core/sipe-ews.c +++ b/src/core/sipe-ews.c @@ -441,9 +441,11 @@ static void sipe_ews_process_autodiscover(SIPE_UNUSED_PARAMETER struct sipe_core static void sipe_ews_send_http_request(struct sipe_calendar *cal) { - sipe_cal_http_authentication(cal); - sipe_http_request_allow_redirect(cal->request); - sipe_http_request_ready(cal->request); + if (cal->request) { + sipe_cal_http_authentication(cal); + sipe_http_request_allow_redirect(cal->request); + sipe_http_request_ready(cal->request); + } } static void sipe_ews_do_autodiscover(struct sipe_calendar *cal, -- 2.11.4.GIT