kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 03:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx_ael: unregister AELSub application and CLI commands on module load failure

Browse Source 
This fixes crashes/hangs I noticed with Asterisk 20.3.0 and 20.13.0 and quickly found out,
that the AEL module doesn't do proper cleanup when it fails to load.
This happens for example when there are syntax errors and AEL fails to compile in which case pbx_load_module()
returns an error but load_module() doesn't then unregister CLI cmds and the application.

(cherry picked from commit c00e809ff0)
This commit is contained in:
Andreas Wehrmann
2025-04-18 10:56:05 +02:00
committed by Asterisk Development Team
parent a2020fd04b
commit 1ab473c973
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pbx/pbx_ael.c
View File

@@ -270,11 +270,21 @@ static int unload_module(void)
static int load_module(void) static int load_module(void)
{ {
int pbx_load_res = AST_MODULE_LOAD_SUCCESS;
ast_cli_register_multiple(cli_ael, ARRAY_LEN(cli_ael)); ast_cli_register_multiple(cli_ael, ARRAY_LEN(cli_ael));
#ifndef STANDALONE #ifndef STANDALONE
ast_register_application_xml(aelsub, aelsub_exec); ast_register_application_xml(aelsub, aelsub_exec);
#endif #endif
return (pbx_load_module()); pbx_load_res = pbx_load_module();
if (AST_MODULE_LOAD_SUCCESS != pbx_load_res) {
#ifndef STANDALONE
ast_unregister_application(aelsub);
#endif
ast_cli_unregister_multiple(cli_ael, ARRAY_LEN(cli_ael));
}
return pbx_load_res;
} }
static int reload(void) static int reload(void)