mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +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:
@@ -344,12 +344,12 @@ static int festival_exec(struct ast_channel *chan, const char *vdata)
|
||||
const char *endcmd = "\" 'file)(quit)\n";
|
||||
|
||||
strln = strlen(startcmd) + strlen(args.text) + strlen(endcmd) + 1;
|
||||
newfestivalcommand = alloca(strln);
|
||||
newfestivalcommand = ast_alloca(strln);
|
||||
snprintf(newfestivalcommand, strln, "%s%s%s", startcmd, args.text, endcmd);
|
||||
festivalcommand = newfestivalcommand;
|
||||
} else { /* This else parses the festivalcommand that we're sent from the config file for \n's, etc */
|
||||
int x, j;
|
||||
newfestivalcommand = alloca(strlen(festivalcommand) + strlen(args.text) + 1);
|
||||
newfestivalcommand = ast_alloca(strlen(festivalcommand) + strlen(args.text) + 1);
|
||||
|
||||
for (x = 0, j = 0; x < strlen(festivalcommand); x++) {
|
||||
if (festivalcommand[x] == '\\' && festivalcommand[x + 1] == 'n') {
|
||||
|
Reference in New Issue
Block a user