diff options
| -rw-r--r-- | apps/confbridge/conf_chan_record.c | 2 | ||||
| -rw-r--r-- | res/res_calendar.c | 5 | ||||
| -rw-r--r-- | res/res_calendar_caldav.c | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c index 5d3a7dbbe..239fb912c 100644 --- a/apps/confbridge/conf_chan_record.c +++ b/apps/confbridge/conf_chan_record.c @@ -65,7 +65,7 @@ static struct ast_channel *rec_request(const char *type, struct ast_format_cap * if (!capabilities) { return NULL; } - ast_format_cap_append_by_type(capabilities, AST_MEDIA_TYPE_UNKNOWN); + ast_format_cap_append_by_type(capabilities, AST_MEDIA_TYPE_AUDIO); chan = ast_channel_alloc(1, AST_STATE_UP, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, "CBRec/%s-%08x", diff --git a/res/res_calendar.c b/res/res_calendar.c index bf385dba6..3369f38ce 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -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); } diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index b6822b085..248c80e65 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -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); |