From b337e77258079212aaf2f46ea42c4be0ffade28d Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Wed, 27 Nov 2019 21:36:53 +0400 Subject: [PATCH] [Unit-tests] Fix leaks in mod_test and in switch_core_codec, switch_vpx, switch_xml, switch_ivr_play_say tests. --- src/mod/applications/mod_test/mod_test.c | 2 -- tests/unit/switch_core_codec.c | 8 ++++++++ tests/unit/switch_ivr_play_say.c | 2 ++ tests/unit/switch_vpx.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_test/mod_test.c b/src/mod/applications/mod_test/mod_test.c index d5460ac364..c8ce62c39f 100644 --- a/src/mod/applications/mod_test/mod_test.c +++ b/src/mod/applications/mod_test/mod_test.c @@ -257,8 +257,6 @@ static switch_status_t test_asr_get_results(switch_asr_handle_t *ah, char **resu { test_asr_t *context = (test_asr_t *) ah->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_stream_handle_t result = { 0 }; - SWITCH_STANDARD_STREAM(result); if (switch_test_flag(context, ASRFLAG_RETURNED_RESULT) || switch_test_flag(ah, SWITCH_ASR_FLAG_CLOSED)) { return SWITCH_STATUS_FALSE; diff --git a/tests/unit/switch_core_codec.c b/tests/unit/switch_core_codec.c index b01d5220c5..61a70314a4 100644 --- a/tests/unit/switch_core_codec.c +++ b/tests/unit/switch_core_codec.c @@ -74,6 +74,8 @@ FST_CORE_BEGIN("./conf") switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL); fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second); fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second); + switch_core_codec_destroy(&orig_codec); + switch_core_codec_destroy(&new_codec); status = switch_core_codec_init(&orig_codec, "OPUS", @@ -88,6 +90,8 @@ FST_CORE_BEGIN("./conf") switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL); fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second); fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second); + switch_core_codec_destroy(&orig_codec); + switch_core_codec_destroy(&new_codec); status = switch_core_codec_init(&orig_codec, "OPUS", @@ -102,6 +106,8 @@ FST_CORE_BEGIN("./conf") switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL); fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second); fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second); + switch_core_codec_destroy(&orig_codec); + switch_core_codec_destroy(&new_codec); status = switch_core_codec_init(&orig_codec, "G722", @@ -116,6 +122,8 @@ FST_CORE_BEGIN("./conf") switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL); fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second); fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second); + switch_core_codec_destroy(&orig_codec); + switch_core_codec_destroy(&new_codec); } FST_TEST_END() diff --git a/tests/unit/switch_ivr_play_say.c b/tests/unit/switch_ivr_play_say.c index c08cdd5752..6dd1c524f5 100644 --- a/tests/unit/switch_ivr_play_say.c +++ b/tests/unit/switch_ivr_play_say.c @@ -261,6 +261,8 @@ FST_CORE_BEGIN("./conf_playsay") fst_check_string_equals(cJSON_GetObjectCstr(recognition_result, "text"), ""); fst_check_string_equals(digits_collected, NULL); fst_check(terminator_collected == 0); + if (recognition_result) cJSON_Delete(recognition_result); + recognition_result = NULL; } FST_SESSION_END() } diff --git a/tests/unit/switch_vpx.c b/tests/unit/switch_vpx.c index 505b27f09a..d97d09f186 100644 --- a/tests/unit/switch_vpx.c +++ b/tests/unit/switch_vpx.c @@ -82,6 +82,7 @@ FST_CORE_BEGIN("./conf") fst_check(frame.m == 1); fst_check(packets > 0); + switch_img_free(&img); switch_core_codec_destroy(&codec); } FST_TEST_END()