mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-15 06:18:38 +00:00
Merge "res_calendar: Resolve memory leak on calendar destruction" into 17
This commit is contained in:
@@ -118,6 +118,7 @@ static void ewscal_destructor(void *obj)
|
|||||||
if (pvt->session) {
|
if (pvt->session) {
|
||||||
ne_session_destroy(pvt->session);
|
ne_session_destroy(pvt->session);
|
||||||
}
|
}
|
||||||
|
ne_uri_free(&pvt->uri);
|
||||||
ast_string_field_free_memory(pvt);
|
ast_string_field_free_memory(pvt);
|
||||||
|
|
||||||
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
||||||
|
|||||||
@@ -224,6 +224,7 @@ static void exchangecal_destructor(void *obj)
|
|||||||
if (pvt->session) {
|
if (pvt->session) {
|
||||||
ne_session_destroy(pvt->session);
|
ne_session_destroy(pvt->session);
|
||||||
}
|
}
|
||||||
|
ne_uri_free(&pvt->uri);
|
||||||
ast_string_field_free_memory(pvt);
|
ast_string_field_free_memory(pvt);
|
||||||
|
|
||||||
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ static void icalendar_destructor(void *obj)
|
|||||||
if (pvt->data) {
|
if (pvt->data) {
|
||||||
icalcomponent_free(pvt->data);
|
icalcomponent_free(pvt->data);
|
||||||
}
|
}
|
||||||
|
ne_uri_free(&pvt->uri);
|
||||||
ast_string_field_free_memory(pvt);
|
ast_string_field_free_memory(pvt);
|
||||||
|
|
||||||
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
|
||||||
|
|||||||
Reference in New Issue
Block a user