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

Avoid infinite recursion and crash

Change-Id: I8ed05ec3aa2806c50c77edc5dd0cd4e4fa08b3f4
(cherry picked from commit e091aa276348d7f8673ce78b29e8f157c73ce90a)

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 8bf3af0a8eb3e0b4d78f0fcf86d3be549b2393ad..ed1c23d3fb9a6bd5c2a379fdac04bc9027fe0361 100644 (file)
--- 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