[asterisk-commits] Correct some leaks in unit tests. (asterisk[master])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/6148 )

Change subject: Correct some leaks in unit tests.
......................................................................

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
---
M channels/sip/dialplan_functions.c
M tests/test_config.c
M tests/test_core_format.c
M tests/test_stream.c
M tests/test_taskprocessor.c
5 files changed, 12 insertions(+), 3 deletions(-)

Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index e21bb2c..59e841d 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -484,6 +484,9 @@
 		dialog_unlink_all(p);
 		dialog_unref(p, "Destroy test object");
 	}
+	if (chan) {
+		ast_channel_unref(chan);
+	}
 	ast_rtp_engine_unregister(&test_engine);
 	return res;
 }
diff --git a/tests/test_config.c b/tests/test_config.c
index d737108..8675cb8 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -1038,6 +1038,7 @@
 	res = AST_TEST_PASS;
 
 out:
+	ast_config_hook_unregister("test_hook");
 	delete_config_file();
 	return res;
 }
@@ -1675,6 +1676,8 @@
 	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 a697f8e..164dff8 100644
--- a/tests/test_core_format.c
+++ b/tests/test_core_format.c
@@ -858,6 +858,7 @@
 {
 	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 @@
 		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 fdb9885..28983e0 100644
--- a/tests/test_stream.c
+++ b/tests/test_stream.c
@@ -1522,7 +1522,7 @@
 		}
 		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 be48f92..ad2074c 100644
--- a/tests/test_taskprocessor.c
+++ b/tests/test_taskprocessor.c
@@ -677,7 +677,7 @@
 {
 	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;
 

-- 
To view, visit https://gerrit.asterisk.org/6148
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I94d364d195cf3b3b5de2bf3ad565343275c7ad31
Gerrit-Change-Number: 6148
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20170804/a4ffb391/attachment-0001.html>