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

cdr_pgsql: Fix crash when the module fails to load multiple times.

Browse Source 
Missing or corrupt cdr_pgsql.conf configuration file can cause the
second attempt to load the PostgreSQL CDR module to crash Asterisk via
the Command Line Interface because a null CLI command is registered on
the first failed attempt to load the module.

Resolves: #736
(cherry picked from commit c3d2f32852)
This commit is contained in:
chrsmj
2024-05-16 14:12:51 -06:00
committed by Asterisk Development Team
parent 63e25ed4fe
commit b5b873d8b8
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cdr/cdr_pgsql.c
View File

@@ -783,12 +783,23 @@ static int config_module(int reload)
static int load_module(void) static int load_module(void)
{ {
ast_cli_register_multiple(cdr_pgsql_status_cli, sizeof(cdr_pgsql_status_cli) / sizeof(struct ast_cli_entry)); int res;
if (config_module(0)) { if (config_module(0)) {
return AST_MODULE_LOAD_DECLINE; res = AST_MODULE_LOAD_DECLINE;
} else if (ast_cdr_register(name, ast_module_info->description, pgsql_log)) {
res = AST_MODULE_LOAD_DECLINE;
} else if (ast_cli_register_multiple(cdr_pgsql_status_cli, ARRAY_LEN(cdr_pgsql_status_cli))) {
res = AST_MODULE_LOAD_DECLINE;
} else {
res = AST_MODULE_LOAD_SUCCESS;
} }
return ast_cdr_register(name, ast_module_info->description, pgsql_log)
? AST_MODULE_LOAD_DECLINE : 0; if (res != AST_MODULE_LOAD_SUCCESS) {
unload_module();
}
return res;
} }
static int reload(void) static int reload(void)