Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix misuses of asprintf throughout the code.

Browse Source 
This fixes three main issues

* Change asprintf() uses to ast_asprintf() so that it
pairs properly with ast_free() and no longer causes
MALLOC_DEBUG to freak out.

* When ast_asprintf() fails, set the pointer NULL if
it will be referenced later.

* Fix some memory leaks that were spotted while taking
care of the first two points.

(Closes issue ASTERISK-20135)
reported by Richard Mudgett

Review: https://reviewboard.asterisk.org/r/2071
........

Merged revisions 371590 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@371591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10
Mark Michelson 13 years ago
parent a303a12d33
commit 9928641702
14 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File

6
apps/app_dial.c
Unescape View File

@ -2795,8 +2795,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
ast_exists_extension(peer, opt_args[OPT_ARG_CALLEE_GOSUB], "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL))) {
what_is_s = "~~s~~";
}
if (asprintf(&gosub_args, "%s,%s,1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s, gosub_argstart + 1) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s, gosub_argstart + 1) < 0) {
gosub_args = NULL;
}
*gosub_argstart = ',';
@ -2806,8 +2805,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
ast_exists_extension(peer, opt_args[OPT_ARG_CALLEE_GOSUB], "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL))) {
what_is_s = "~~s~~";
}
if (asprintf(&gosub_args, "%s,%s,1", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,1", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s) < 0) {
gosub_args = NULL;
}
}

6
apps/app_queue.c
Unescape View File

@ -5101,8 +5101,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL))) {
what_is_s = "~~s~~";
}
if (asprintf(&gosub_args, "%s,%s,1(%s)", gosubexec, what_is_s, gosub_argstart + 1) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,1(%s)", gosubexec, what_is_s, gosub_argstart + 1) < 0) {
gosub_args = NULL;
}
*gosub_argstart = ',';
@ -5112,8 +5111,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.id.number.str, NULL))) {
what_is_s = "~~s~~";
}
if (asprintf(&gosub_args, "%s,%s,1", gosubexec, what_is_s) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,1", gosubexec, what_is_s) < 0) {
gosub_args = NULL;
}
}

6
apps/app_stack.c
Unescape View File

@ -792,13 +792,11 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, const char
* call a Gosub for the CALLEE channel in Dial or Queue.
*/
if (argc == 5) {
if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + (chan->pbx ? 1 : 0), argv[4]) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + (chan->pbx ? 1 : 0), argv[4]) < 0) {
gosub_args = NULL;
}
} else {
if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + (chan->pbx ? 1 : 0)) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + (chan->pbx ? 1 : 0)) < 0) {
gosub_args = NULL;
}
}

4
cdr/cdr_tds.c
Unescape View File

@ -360,11 +360,11 @@ static int execute_and_consume(DBPROCESS *dbproc, const char *fmt, ...)
va_end(ap);
if (dbfcmd(dbproc, buffer) == FAIL) {
free(buffer);
ast_free(buffer);
return 1;
}
free(buffer);
ast_free(buffer);
if (dbsqlexec(dbproc) == FAIL) {
return 1;

4
channels/chan_dahdi.c
Unescape View File

@ -14341,8 +14341,8 @@ static char *complete_span_helper(const char *line, const char *word, int pos, i
for (which = span = 0; span < NUM_SPANS; span++) {
if (pris[span].pri.pri && ++which > state) {
if (asprintf(&ret, "%d", span + 1) < 0) { /* user indexes start from 1 */
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&ret, "%d", span + 1) < 0) { /* user indexes start from 1 */
ret = NULL;
}
break;
}

4
channels/chan_oss.c
Unescape View File

@ -1393,9 +1393,7 @@ static struct chan_oss_pvt *store_config(struct ast_config *cfg, char *ctg)
if (o->mixer_cmd) {
char *cmd;
if (asprintf(&cmd, "mixer %s", o->mixer_cmd) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
} else {
if (ast_asprintf(&cmd, "mixer %s", o->mixer_cmd) >= 0) {
ast_log(LOG_WARNING, "running [%s]\n", cmd);
if (system(cmd) < 0) {
ast_log(LOG_WARNING, "system() failed: %s\n", strerror(errno));

4
channels/chan_sip.c
Unescape View File

@ -28989,9 +28989,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
ast_free_ha(olddirectmediaha);
if (!ast_strlen_zero(callback)) { /* build string from peer info */
char *reg_string;
if (asprintf(&reg_string, "%s?%s:%s@%s/%s", peer->name, peer->username, !ast_strlen_zero(peer->remotesecret) ? peer->remotesecret : peer->secret, peer->tohost, callback) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
} else if (reg_string) {
if (ast_asprintf(&reg_string, "%s?%s:%s@%s/%s", peer->name, peer->username, !ast_strlen_zero(peer->remotesecret) ? peer->remotesecret : peer->secret, peer->tohost, callback) >= 0) {
sip_register(reg_string, 0); /* XXX TODO: count in registry_count */
ast_free(reg_string);
}

8
funcs/func_odbc.c
Unescape View File

@ -953,12 +953,12 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu
}
if ((tmp = ast_variable_retrieve(cfg, catg, "prefix")) && !ast_strlen_zero(tmp)) {
if (asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg) < 0) {
(*query)->acf->name = NULL;
}
} else {
if (asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg) < 0) {
(*query)->acf->name = NULL;
}
}

16
main/file.c
Unescape View File

@ -261,14 +261,12 @@ static char *build_filename(const char *filename, const char *ext)
ext = "WAV";
if (filename[0] == '/') {
if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&fn, "%s.%s", filename, ext) < 0) {
fn = NULL;
}
} else {
if (asprintf(&fn, "%s/sounds/%s.%s",
if (ast_asprintf(&fn, "%s/sounds/%s.%s",
ast_config_AST_DATA_DIR, filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
fn = NULL;
}
}
@ -1073,6 +1071,9 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
format_found = 1;
fn = build_filename(filename, type);
if (!fn) {
continue;
}
errno = 0;
bfile = fopen(fn, "r");
@ -1093,6 +1094,7 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
fs->mode = mode;
fs->filename = ast_strdup(filename);
fs->vfs = NULL;
ast_free(fn);
break;
}
@ -1140,6 +1142,9 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
format_found = 1;
fn = build_filename(filename, type);
if (!fn) {
continue;
}
fd = open(fn, flags | myflags, mode);
if (fd > -1) {
/* fdopen() the resulting file stream */
@ -1201,6 +1206,9 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
ast_closestream(fs);
fs = NULL;
}
if (!buf) {
ast_free(fn);
}
continue;
}
fs->trans = NULL;

3
main/utils.c
Unescape View File

@ -1056,9 +1056,8 @@ int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*st
a->start_routine = start_routine;
a->data = data;
start_routine = dummy_start;
if (asprintf(&a->name, "%-20s started at [%5d] %s %s()",
if (ast_asprintf(&a->name, "%-20s started at [%5d] %s %s()",
start_fn, line, file, caller) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
a->name = NULL;
}
data = a;

36
main/xmldoc.c
Unescape View File

@ -691,7 +691,9 @@ static char *xmldoc_get_syntax_fun(struct ast_xml_node *rootnode, const char *ro
if (!rootnode || !ast_xml_node_get_children(rootnode)) {
/* If the rootnode field is not found, at least print name. */
ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : ""));
if (ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : "")) < 0) {
syntax = NULL;
}
return syntax;
}
@ -731,7 +733,9 @@ static char *xmldoc_get_syntax_fun(struct ast_xml_node *rootnode, const char *ro
if (!hasparams) {
/* This application, function, option, etc, doesn't have any params. */
ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : ""));
if (ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : "")) < 0) {
syntax = NULL;
}
return syntax;
}
@ -803,13 +807,19 @@ static char *xmldoc_get_syntax_fun(struct ast_xml_node *rootnode, const char *ro
ast_free(syntax);
}
/* to give up is ok? */
ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : ""));
if (ast_asprintf(&syntax, "%s%s", (printrootname ? rootname : ""), (printparenthesis ? "()" : "")) < 0) {
syntax = NULL;
}
return syntax;
}
paramname = ast_strdup(paramnameattr);
ast_xml_free_attr(paramnameattr);
}
if (!paramname) {
return NULL;
}
/* Defaults to 'false'. */
multiple = 0;
if ((multipletype = ast_xml_get_attribute(node, "multiple"))) {
@ -1407,8 +1417,7 @@ static int xmldoc_parse_variablelist(struct ast_xml_node *node, const char *tabs
}
/* use this spacing (add 4 spaces) inside a variablelist node. */
ast_asprintf(&vartabs, "%s ", tabs);
if (!vartabs) {
if (ast_asprintf(&vartabs, "%s ", tabs) < 0) {
return ret;
}
for (tmp = ast_xml_node_get_children(node); tmp; tmp = ast_xml_node_get_next(tmp)) {
@ -1525,7 +1534,9 @@ static int xmldoc_parse_enum(struct ast_xml_node *fixnode, const char *tabs, str
int ret = 0;
char *optiontabs;
ast_asprintf(&optiontabs, "%s ", tabs);
if (ast_asprintf(&optiontabs, "%s ", tabs) < 0) {
return ret;
}
for (node = ast_xml_node_get_children(node); node; node = ast_xml_node_get_next(node)) {
if ((xmldoc_parse_para(node, (ret ? tabs : " - "), "\n", buffer))) {
@ -1591,8 +1602,7 @@ static int xmldoc_parse_option(struct ast_xml_node *fixnode, const char *tabs, s
int ret = 0;
char *optiontabs;
ast_asprintf(&optiontabs, "%s ", tabs);
if (!optiontabs) {
if (ast_asprintf(&optiontabs, "%s ", tabs) < 0) {
return ret;
}
for (node = ast_xml_node_get_children(fixnode); node; node = ast_xml_node_get_next(node)) {
@ -1698,8 +1708,8 @@ static void xmldoc_parse_parameter(struct ast_xml_node *fixnode, const char *tab
return;
}
ast_asprintf(&internaltabs, "%s ", tabs);
if (!internaltabs) {
if (ast_asprintf(&internaltabs, "%s ", tabs) < 0) {
ast_xml_free_attr(paramname);
return;
}
@ -1983,8 +1993,10 @@ int ast_xmldoc_load_documentation(void)
globret = xml_pathmatch(xmlpattern, xmlpattern_maxlen, &globbuf);
#else
/* Get every *-LANG.xml file inside $(ASTDATADIR)/documentation */
ast_asprintf(&xmlpattern, "%s/documentation{/thirdparty/,/}*-{%s,%.2s_??,%s}.xml", ast_config_AST_DATA_DIR,
documentation_language, documentation_language, default_documentation_language);
if (ast_asprintf(&xmlpattern, "%s/documentation{/thirdparty/,/}*-{%s,%.2s_??,%s}.xml", ast_config_AST_DATA_DIR,
documentation_language, documentation_language, default_documentation_language) < 0) {
return 1;
}
globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf);
#endif

6
pbx/pbx_config.c
Unescape View File

@ -435,14 +435,12 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
if (++which > a->n) {
/* If there is an extension then return exten@context. */
if (ast_get_extension_matchcid(e) && (!strchr(a->word, '@') || strchr(a->word, '/'))) {
if (asprintf(&ret, "%s/%s@%s", ast_get_extension_name(e), ast_get_extension_cidmatch(e), ast_get_context_name(c)) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&ret, "%s/%s@%s", ast_get_extension_name(e), ast_get_extension_cidmatch(e), ast_get_context_name(c)) < 0) {
ret = NULL;
}
break;
} else if (!ast_get_extension_matchcid(e) && !strchr(a->word, '/')) {
if (asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c)) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c)) < 0) {
ret = NULL;
}
break;

6
res/res_config_sqlite.c
Unescape View File

@ -668,13 +668,13 @@ static struct sqlite_cache_tables *find_table(const char *tablename)
}
/* Table structure not cached; build the structure now */
if (asprintf(&sql, sql_table_structure, tablename) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&sql, sql_table_structure, tablename) < 0) {
sql = NULL;
}
if (!(tblptr = ast_calloc(1, sizeof(*tblptr) + strlen(tablename) + 1))) {
AST_RWLIST_UNLOCK(&sqlite_tables);
ast_log(LOG_ERROR, "Memory error. Cannot cache table '%s'\n", tablename);
ast_free(sql);
return NULL;
}
tblptr->name = (char *)tblptr + sizeof(*tblptr);
@ -690,9 +690,11 @@ static struct sqlite_cache_tables *find_table(const char *tablename)
ast_free(errstr);
free_table(tblptr);
AST_RWLIST_UNLOCK(&sqlite_tables);
ast_free(sql);
return NULL;
}
ast_mutex_unlock(&mutex);
ast_free(sql);
if (AST_LIST_EMPTY(&(tblptr->columns))) {
free_table(tblptr);

7
res/res_jabber.c
Unescape View File

@ -1760,11 +1760,9 @@ static int aji_act_hook(void *data, int type, iks *node)
sprintf(secret, "%s%s", pak->id, client->password);
ast_sha1_hash(shasum, secret);
handshake = NULL;
if (asprintf(&handshake, "<handshake>%s</handshake>", shasum) >= 0) {
if (ast_asprintf(&handshake, "<handshake>%s</handshake>", shasum) >= 0) {
aji_send_raw(client, handshake);
ast_free(handshake);
handshake = NULL;
}
client->state = AJI_CONNECTING;
if (aji_recv(client, 1) == 2) /*XXX proper result for iksemel library on iks_recv of <handshake/> XXX*/
@ -4482,8 +4480,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug)
return 0;
}
if (!strchr(client->user, '/') && !client->component) { /*client */
resource = NULL;
if (asprintf(&resource, "%s/asterisk", client->user) >= 0) {
if (ast_asprintf(&resource, "%s/asterisk", client->user) >= 0) {
client->jid = iks_id_new(client->stack, resource);
ast_free(resource);
}

Write Preview
Loading…
Cancel
Save