From 706dd687f2c0e5429f4f2873909aabbb2429f8e8 Mon Sep 17 00:00:00 2001 From: Jan Kalab Date: Tue, 4 Jan 2011 17:04:14 +0000 Subject: Merged revisions 300214 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r300214 | pitel | 2011-01-04 18:01:52 +0100 (Út, 04 led 2011) | 7 lines Memory leaking in calendars ne_request_destroy() was missing in icalendar and exchange calendar modules, causing memory leak. (closes issue #18521) Review: https://reviewboard.asterisk.org/r/1068/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300215 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_calendar_exchange.c | 1 + res/res_calendar_icalendar.c | 1 + 2 files changed, 2 insertions(+) (limited to 'res') diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c index 8f3989c5d..2238124db 100644 --- a/res/res_calendar_exchange.c +++ b/res/res_calendar_exchange.c @@ -403,6 +403,7 @@ static struct ast_str *exchangecal_request(struct exchangecal_pvt *pvt, const ch ne_add_request_header(req, "Content-type", "text/xml"); ret = ne_request_dispatch(req); + ne_request_destroy(req); if (ret != NE_OK || !ast_str_strlen(response)) { ast_log(LOG_WARNING, "Unknown response to CalDAV calendar %s, request %s to %s: %s\n", pvt->owner->name, method, pvt->url, ne_get_error(pvt->session)); diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index d91cd0fe0..d503eac35 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -142,6 +142,7 @@ static icalcomponent *fetch_icalendar(struct icalendar_pvt *pvt) ne_add_response_body_reader(req, ne_accept_2xx, fetch_response_reader, &response); ret = ne_request_dispatch(req); + ne_request_destroy(req); if (ret != NE_OK || !ast_str_strlen(response)) { ast_log(LOG_WARNING, "Unable to retrieve iCalendar '%s' from '%s': %s\n", pvt->owner->name, pvt->url, ne_get_error(pvt->session)); ast_free(response); -- cgit v1.2.3