From: Jonathan Rose <jrose@digium.com>
Date: Thu, 24 Oct 2013 19:55:23 +0000 (+0000)
Subject: test_linkedlists: Fix memory leak
X-Git-Tag: 11.7.0-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59d4497fec3170666014541e9cf6ac3f0a5123e;p=thirdparty%2Fasterisk.git

test_linkedlists: Fix memory leak

(issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
    test_linkedlists-1.8.patch uploaded by coreyfarrell (license 5909)
    test_linkedlists-11up.patch uploaded by coreyfarrell (license 5909)
........

Merged revisions 401790 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@401791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/tests/test_linkedlists.c b/tests/test_linkedlists.c
index 2aee5c9a20..9edab942c6 100644
--- a/tests/test_linkedlists.c
+++ b/tests/test_linkedlists.c
@@ -105,19 +105,16 @@ static int dbl_list_expect_reverse(struct test_dbl_llist *test_list, const char
 #define MATCH_OR_FAIL(list, val, retbuf) \
 	if (list_expect(list, val, &retbuf)) { \
 		ast_test_status_update(test, "Expected: %s, Got: %s\n", val, ast_str_buffer(retbuf)); \
-		ast_free(retbuf); \
 		return AST_TEST_FAIL; \
 	}
 
 #define MATCH_OR_FAIL_DBL(list, val, retbuf) \
 	if (dbl_list_expect_forward(list, val, &retbuf)) { \
 		ast_test_status_update(test, "Expected: %s, Got: %s\n", val, ast_str_buffer(retbuf)); \
-		ast_free(retbuf); \
 		return AST_TEST_FAIL; \
 	} \
 	if (dbl_list_expect_reverse(list, val, &retbuf)) { \
 		ast_test_status_update(test, "Expected reverse of: %s, Got: %s\n", val, ast_str_buffer(retbuf)); \
-		ast_free(retbuf); \
 		return AST_TEST_FAIL; \
 	}
 
@@ -129,7 +126,7 @@ static int dbl_list_expect_reverse(struct test_dbl_llist *test_list, const char
 
 AST_TEST_DEFINE(single_ll_tests)
 {
-	struct ast_str *buf;
+	RAII_VAR(struct ast_str *, buf, NULL, ast_free);
 	struct test_llist test_list = { 0, };
 	struct test_llist other_list = { 0, };
 	struct test_val *bogus;
@@ -340,7 +337,7 @@ AST_TEST_DEFINE(single_ll_tests)
 
 AST_TEST_DEFINE(double_ll_tests)
 {
-	struct ast_str *buf;
+	RAII_VAR(struct ast_str *, buf, NULL, ast_free);
 	struct test_dbl_llist test_list = { 0, };
 	struct test_dbl_llist other_list = { 0, };
 	struct test_val *bogus;