res/res_sorcery_config: Prevent crash from misconfigured sorcery.conf

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

diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c
index db3316e4eec3cc1f86fb6e8e302653988f86f9ad..312015c0577ff558976adf0f5c99ab7d3012b505 100644 (file)
--- a/res/res_sorcery_config.c
+++ b/res/res_sorcery_config.c
@@ -348,9 +348,18 @@ static void sorcery_config_reload(void *data, const struct ast_sorcery *sorcery,
 
 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;
 
+       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))) {
                return NULL;
        }