From 1a3e08326e3d2c3a82157e55e5f7f13c3d3af55a Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Thu, 3 Aug 2017 21:58:25 -0400 Subject: Correct some leaks in unit tests. * chan_sip: channel in test_sip_rtpqos_1. * test_config: config hook, config info and global config holder. * test_core_format: format in format_attribute_set_without_interface. * test_stream: unneeded frame duplication. * test_taskprocessor: task_data. Change-Id: I94d364d195cf3b3b5de2bf3ad565343275c7ad31 --- tests/test_config.c | 3 +++ tests/test_core_format.c | 5 ++++- tests/test_stream.c | 2 +- tests/test_taskprocessor.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test_config.c b/tests/test_config.c index d73710860..8675cb890 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -1038,6 +1038,7 @@ AST_TEST_DEFINE(config_hook) res = AST_TEST_PASS; out: + ast_config_hook_unregister("test_hook"); delete_config_file(); return res; } @@ -1675,6 +1676,8 @@ AST_TEST_DEFINE(config_options_test) configs.codeccapopt = NULL; ast_string_field_free_memory(&defaults); ast_string_field_free_memory(&configs); + aco_info_destroy(&cfg_info); + ao2_global_obj_release(global_obj); return res; } diff --git a/tests/test_core_format.c b/tests/test_core_format.c index a697f8e7d..164dff81f 100644 --- a/tests/test_core_format.c +++ b/tests/test_core_format.c @@ -858,6 +858,7 @@ AST_TEST_DEFINE(format_attribute_set_without_interface) { RAII_VAR(struct ast_codec *, codec, NULL, ao2_cleanup); RAII_VAR(struct ast_format *, format, NULL, ao2_cleanup); + struct ast_format *attr_set; switch (cmd) { case TEST_INIT: @@ -883,10 +884,12 @@ AST_TEST_DEFINE(format_attribute_set_without_interface) return AST_TEST_FAIL; } - if (!ast_format_attribute_set(format, "bees", "cool")) { + attr_set = ast_format_attribute_set(format, "bees", "cool"); + if (!attr_set) { ast_test_status_update(test, "Successfully set an attribute on a format without an interface\n"); return AST_TEST_FAIL; } + ao2_cleanup(attr_set); return AST_TEST_PASS; } diff --git a/tests/test_stream.c b/tests/test_stream.c index fdb988584..28983e05c 100644 --- a/tests/test_stream.c +++ b/tests/test_stream.c @@ -1522,7 +1522,7 @@ static int load_stream_readqueue(struct ast_channel *chan, int frames) } f.stream_num = pvt->frame_count % pvt->streams; f.seqno = pvt->frame_count; - ast_queue_frame(chan, ast_frdup(&f)); + ast_queue_frame(chan, &f); pvt->frame_count++; } diff --git a/tests/test_taskprocessor.c b/tests/test_taskprocessor.c index be48f9248..ad2074cb8 100644 --- a/tests/test_taskprocessor.c +++ b/tests/test_taskprocessor.c @@ -677,7 +677,7 @@ AST_TEST_DEFINE(taskprocessor_push_local) { RAII_VAR(struct ast_taskprocessor *, tps, NULL, ast_taskprocessor_unreference); - struct task_data *task_data; + RAII_VAR(struct task_data *, task_data, NULL, ao2_cleanup); int local_data; int res; -- cgit v1.2.3