diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-02-11 17:04:50 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-11 17:04:51 -0600 |
| commit | a39486552efb30ca4067d0b8e919ed03f332b4af (patch) | |
| tree | 6efcc50a3d9d9676e532c777de8984ea76a8b5bd | |
| parent | e5fd972d2474c0b200830a000bb5ce2d6b1460c2 (diff) | |
| parent | c4d9f468783c27c6e53f6a00ae30fd90bd3ac20f (diff) | |
Merge "Resources/res_phoneprov: fix memory leak and heap-use-after-free"
| -rw-r--r-- | res/res_phoneprov.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index 51c0b4a51..b448c8e0b 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -1193,8 +1193,7 @@ static struct ast_http_uri phoneprovuri = { static struct varshead *get_defaults(void) { - struct ast_config *phoneprov_cfg; - struct ast_config *cfg; + struct ast_config *phoneprov_cfg, *cfg = CONFIG_STATUS_FILEINVALID; const char *value; struct ast_variable *v; struct ast_var_t *var; @@ -1233,10 +1232,12 @@ static struct varshead *get_defaults(void) if (!value) { if ((cfg = ast_config_load("sip.conf", config_flags)) && cfg != CONFIG_STATUS_FILEINVALID) { value = ast_variable_retrieve(cfg, "general", "bindport"); - ast_config_destroy(cfg); } } var = ast_var_assign(variable_lookup[AST_PHONEPROV_STD_SERVER_PORT], S_OR(value, "5060")); + if (cfg && cfg != CONFIG_STATUS_FILEINVALID) { + ast_config_destroy(cfg); + } AST_VAR_LIST_INSERT_TAIL(defaults, var); value = ast_variable_retrieve(phoneprov_cfg, "general", pp_general_lookup[AST_PHONEPROV_STD_PROFILE]); @@ -1288,6 +1289,7 @@ static int load_users(void) if (!(cfg = ast_config_load("users.conf", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_WARNING, "Unable to load users.conf\n"); + ast_var_list_destroy(defaults); return -1; } @@ -1337,6 +1339,7 @@ static int load_users(void) } } ast_config_destroy(cfg); + ast_var_list_destroy(defaults); return 0; } |