kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_sorcery_config: Prevent crash from misconfigured sorcery.conf

Browse Source 
Misconfiguring sorcery.conf with a 'config' wizard with no extra data
will currently crash Asterisk on startup, as the wizard requires a comma
delineated list to parse. This patch updates res_sorcery_config to check
for the presence of the data before it starts manipulating it.

Change-Id: I4c97512e8258bc82abe190627a9206c28f5d3847
This commit is contained in:
Matt Jordan
2015-07-19 09:11:18 -05:00
parent 7908ae4934
commit 9475dc9492
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_sorcery_config.c
View File

@@ -348,9 +348,18 @@ static void sorcery_config_reload(void *data, const struct ast_sorcery *sorcery,
static void *sorcery_config_open(const char *data) static void *sorcery_config_open(const char *data)
{ {
char *tmp = ast_strdupa(data), *filename = strsep(&tmp, ","), *option; char *tmp;
char *filename;
char *option;
struct sorcery_config *config; struct sorcery_config *config;
if (ast_strlen_zero(data)) {
return NULL;
}
tmp = ast_strdupa(data);
filename = strsep(&tmp, ",");
if (ast_strlen_zero(filename) || !(config = ao2_alloc_options(sizeof(*config) + strlen(filename) + 1, sorcery_config_destructor, AO2_ALLOC_OPT_LOCK_NOLOCK))) { if (ast_strlen_zero(filename) || !(config = ao2_alloc_options(sizeof(*config) + strlen(filename) + 1, sorcery_config_destructor, AO2_ALLOC_OPT_LOCK_NOLOCK))) {
return NULL; return NULL;
} }