From 7fc26e8617e1e72d58bb422e2bc314b4886f48aa Mon Sep 17 00:00:00 2001 From: Mark Murawski Date: Tue, 5 Oct 2021 20:59:05 -0400 Subject: [PATCH] pbx_ael: Fix crash and lockup issue regarding 'ael reload' Avoid infinite recursion and crash Change-Id: I8ed05ec3aa2806c50c77edc5dd0cd4e4fa08b3f4 --- pbx/pbx_ael.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 8bf3af0a8e..ed1c23d3fb 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -280,13 +280,8 @@ static int load_module(void) static int reload(void) { -#ifndef STANDALONE - /* Lock-Protected reload. It is VERY BAD to have simultaneous ael pbx_load_module() executing at the same time */ - return ast_module_reload("pbx_ael") == AST_MODULE_RELOAD_SUCCESS ? AST_MODULE_LOAD_SUCCESS : AST_MODULE_LOAD_DECLINE; -#else - /* Lock-Protected reload not needed (and not available) when running standalone (Example: via aelparse cli tool). No reload contention is possible */ + /* Lock-Protected reload not needed because we're already being called from ast_module_reload() */ return pbx_load_module(); -#endif } #ifdef STANDALONE