mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Clean up and ensure proper usage of alloca()
This replaces all calls to alloca() with ast_alloca() which calls gcc's __builtin_alloca() to avoid BSD semantics and removes all NULL checks on memory allocated via ast_alloca() and ast_strdupa(). (closes issue ASTERISK-20125) Review: https://reviewboard.asterisk.org/r/2032/ Patch-by: Walter Doekes (wdoekes) ........ Merged revisions 370642 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 370643 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -295,7 +295,7 @@ static int aMYSQL_set(struct ast_channel *chan, char *data)
|
||||
AST_NONSTANDARD_APP_ARGS(args, data, ' ');
|
||||
|
||||
if (args.argc == 3) {
|
||||
var = alloca(6 + strlen(args.variable) + 1);
|
||||
var = ast_alloca(6 + strlen(args.variable) + 1);
|
||||
sprintf(var, "MYSQL_%s", args.variable);
|
||||
|
||||
/* Make the parameter case-insensitive */
|
||||
|
@@ -557,7 +557,7 @@ static char *handle_cli_mobile_search(struct ast_cli_entry *e, int cmd, struct a
|
||||
max_rsp = 255;
|
||||
flags = IREQ_CACHE_FLUSH;
|
||||
|
||||
ii = alloca(max_rsp * sizeof(inquiry_info));
|
||||
ii = ast_alloca(max_rsp * sizeof(inquiry_info));
|
||||
num_rsp = hci_inquiry(adapter->dev_id, len, max_rsp, NULL, &ii, flags);
|
||||
if (num_rsp > 0) {
|
||||
ast_cli(a->fd, FORMAT1, "Address", "Name", "Usable", "Type", "Port");
|
||||
|
@@ -144,7 +144,7 @@ static struct mysql_conn *find_database(const char *database, int for_write)
|
||||
if (for_write) {
|
||||
whichdb = ast_strdupa(ptr + 1);
|
||||
} else {
|
||||
whichdb = alloca(ptr - database + 1);
|
||||
whichdb = ast_alloca(ptr - database + 1);
|
||||
strncpy(whichdb, database, ptr - database);
|
||||
whichdb[ptr - database] = '\0';
|
||||
}
|
||||
@@ -467,7 +467,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
|
||||
}
|
||||
|
||||
initfield = ast_strdupa(newparam);
|
||||
if (initfield && (op = strchr(initfield, ' '))) {
|
||||
if ((op = strchr(initfield, ' '))) {
|
||||
*op = '\0';
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user