Fix potential crash after unload of func_periodic_hook or test_message.

[asterisk/asterisk.git] / funcs / func_periodic_hook.c

diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index 6ddab56..bb0ee0d 100644 (file)
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -446,13 +446,9 @@ static struct ast_custom_function hook_function = {
        .write = hook_write,
 };
 
        .write = hook_write,
 };
 

-static struct ast_context *func_periodic_hook_context;
-

 static int unload_module(void)
 {
 static int unload_module(void)
 {

-       if (func_periodic_hook_context) {
-               ast_context_destroy(func_periodic_hook_context, AST_MODULE);
-       }
+       ast_context_destroy(NULL, AST_MODULE);

 
        return ast_custom_function_unregister(&hook_function);
 }
 
        return ast_custom_function_unregister(&hook_function);
 }

@@ -461,9 +457,7 @@ static int load_module(void)
 {
        int res;
 
 {
        int res;
 

-       func_periodic_hook_context = ast_context_find_or_create(NULL, NULL,
-                       context_name, AST_MODULE);
-       if (!func_periodic_hook_context) {
+       if (!ast_context_find_or_create(NULL, NULL, context_name, AST_MODULE)) {

                ast_log(LOG_ERROR, "Failed to create %s dialplan context.\n", context_name);
                return AST_MODULE_LOAD_DECLINE;
        }
                ast_log(LOG_ERROR, "Failed to create %s dialplan context.\n", context_name);
                return AST_MODULE_LOAD_DECLINE;
        }