Merge "Prevent Undefined Capath Crash"

This commit is contained in:
Jenkins2
2017-05-11 10:38:38 -05:00
committed by Gerrit Code Review
+8
View File
@@ -8736,6 +8736,10 @@ static void manager_shutdown(void)
ami_tls_cfg.pvtfile = NULL;
ast_free(ami_tls_cfg.cipher);
ami_tls_cfg.cipher = NULL;
ast_free(ami_tls_cfg.cafile);
ami_tls_cfg.cafile = NULL;
ast_free(ami_tls_cfg.capath);
ami_tls_cfg.capath = NULL;
ao2_global_obj_release(mgr_sessions);
@@ -8836,6 +8840,10 @@ static void manager_set_defaults(void)
ami_tls_cfg.pvtfile = ast_strdup("");
ast_free(ami_tls_cfg.cipher);
ami_tls_cfg.cipher = ast_strdup("");
ast_free(ami_tls_cfg.cafile);
ami_tls_cfg.cafile = ast_strdup("");
ast_free(ami_tls_cfg.capath);
ami_tls_cfg.capath = ast_strdup("");
}
static int __init_manager(int reload, int by_external_config)