diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-05-20 15:22:58 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-20 15:22:58 -0500 |
| commit | 4a450f863b6330c653b08261660dfce4a6ba3403 (patch) | |
| tree | 1a276c6e51f22cfe789444f333ca3c5c56ae94f2 /tests | |
| parent | f9114179e6bc727cd9fe593d50313c19b6e63492 (diff) | |
| parent | 6b7282ca4037114ac19da5149dce958f837d1422 (diff) | |
Merge "Fix potential crash after unload of func_periodic_hook or test_message." into 13
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_message.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/test_message.c b/tests/test_message.c index 5db0ed044..285905d8c 100644 --- a/tests/test_message.c +++ b/tests/test_message.c @@ -51,8 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /*! \brief The number of user events we should get in a dialplan test */ #define DEFAULT_EXPECTED_EVENTS 4 -static struct ast_context *test_message_context; - /*! \brief The current number of received user events */ static int received_user_events; @@ -822,9 +820,7 @@ static int unload_module(void) AST_TEST_UNREGISTER(test_message_has_destination_handler); AST_TEST_UNREGISTER(test_message_msg_send); - if (test_message_context) { - ast_context_destroy(test_message_context, AST_MODULE); - } + ast_context_destroy(NULL, AST_MODULE); ast_manager_unregister_hook(&user_event_hook); @@ -835,8 +831,7 @@ static int create_test_dialplan(void) { int res = 0; - test_message_context = ast_context_find_or_create(NULL, NULL, TEST_CONTEXT, AST_MODULE); - if (!test_message_context) { + if (!ast_context_find_or_create(NULL, NULL, TEST_CONTEXT, AST_MODULE)) { return -1; } |