Skip to content
Snippets Groups Projects
Commit 7fc26e86 authored by Mark Murawski's avatar Mark Murawski Committed by George Joseph
Browse files

pbx_ael: Fix crash and lockup issue regarding 'ael reload'

Avoid infinite recursion and crash

Change-Id: I8ed05ec3aa2806c50c77edc5dd0cd4e4fa08b3f4
parent 7ff6c437
Branches
Tags
3 merge requests!138Merge branch asterisk-20.3.0 into devel properly,!123Merge asterisk '20.3.0' into devel,!118Draft: manager: AOC-S support for AOCMessage
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment