kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_calendar: Plug memory leak and micro-optimization

Browse Source 
ast_variables_destroy is NULL safe, so there is no need to check its
argument before passing it.

ASTERISK-25524 #close
Reported by: Jesper

Change-Id: Ib0f8057642e9d471960f1a79fd42e5a3ce587d3b
This commit is contained in:
Sean Bright
2017-09-13 15:14:25 -04:00
parent 317b62c8b4
commit 55567ee1d8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_calendar.c
View File

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

1
res/res_calendar_caldav.c
View File

@@ -78,6 +78,7 @@ static void caldav_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);