Merge "res_calendar: Plug memory leak and micro-optimization"

This commit is contained in:
Joshua Colp
2017-09-20 09:44:53 -05:00
committed by Gerrit Code Review
2 changed files with 2 additions and 4 deletions

View File

@@ -339,10 +339,7 @@ static void calendar_destructor(void *obj)
}
ast_calendar_clear_events(cal);
ast_string_field_free_memory(cal);
if (cal->vars) {
ast_variables_destroy(cal->vars);
cal->vars = NULL;
}
ast_variables_destroy(cal->vars);
ao2_ref(cal->events, -1);
ao2_unlock(cal);
}

View File

@@ -78,6 +78,7 @@ static void caldav_destructor(void *obj)
if (pvt->session) {
ne_session_destroy(pvt->session);
}
ne_uri_free(&pvt->uri);
ast_string_field_free_memory(pvt);
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);