Merged revisions 300214 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  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

diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index 8f3989c..2238124 100644 (file)
--- 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 d91cd0f..d503eac 100644 (file)
--- 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);