sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_pjsip_config_wizard: Fix leaks and add check for malloc failure."

This commit is contained in:
Jenkins2 2017-11-07 19:41:46 -06:00 committed by Gerrit Code Review
parent 13ffdfd96a f899368cd6
commit ebd9e5c8c3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_pjsip_config_wizard.c
View File

@ -1001,7 +1001,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);
}
}
}
@ -1168,15 +1171,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);
}
}