diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-11-07 22:48:08 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-07 22:48:08 -0600 |
commit | fe78531d5ee538bbcd49cae564d4931285704ef1 (patch) | |
tree | 7903e0c159fe70ebf38a31a37b888b3d289d75dd /res | |
parent | 5c47ee4476c5da0181276f6fb2f1ddd82e591519 (diff) | |
parent | 4f75655cb679e4bc2b68c90427d9d086d3caf3c5 (diff) |
Merge "res_pjsip_config_wizard: Fix leaks and add check for malloc failure." into 13
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip_config_wizard.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c index c13ff4aca..d487c4ddd 100644 --- a/res/res_pjsip_config_wizard.c +++ b/res/res_pjsip_config_wizard.c @@ -1003,7 +1003,10 @@ static int wizard_apply_handler(const struct ast_sorcery *sorcery, struct object char *hosts = ast_strdupa(remote_hosts); while ((host = ast_strsep(&hosts, ',', AST_STRSEP_TRIM))) { - AST_VECTOR_APPEND(&remote_hosts_vector, ast_strdup(host)); + host = ast_strdup(host); + if (host && AST_VECTOR_APPEND(&remote_hosts_vector, host)) { + ast_free(host); + } } } @@ -1170,15 +1173,22 @@ static void wizard_mapped_observer(const char *name, struct ast_sorcery *sorcery /* We're only interested in memory wizards with the pjsip_wizard tag. */ if (wizard_args && !strcmp(wizard_args, "pjsip_wizard")) { otw = ast_malloc(sizeof(*otw) + strlen(object_type) + 1); + if (!otw) { + return; + } + otw->sorcery = sorcery; otw->wizard = wizard; otw->wizard_data = wizard_data; otw->last_config = NULL; strcpy(otw->object_type, object_type); /* Safe */ AST_VECTOR_RW_WRLOCK(&object_type_wizards); - AST_VECTOR_APPEND(&object_type_wizards, otw); + if (AST_VECTOR_APPEND(&object_type_wizards, otw)) { + ast_free(otw); + } else { + ast_debug(1, "Wizard mapped for object_type '%s'\n", object_type); + } AST_VECTOR_RW_UNLOCK(&object_type_wizards); - ast_debug(1, "Wizard mapped for object_type '%s'\n", object_type); } } |