mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-25 14:06:27 +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:
@@ -8328,7 +8328,7 @@ int ast_say_counted_noun(struct ast_channel *chan, int num, const char noun[])
|
||||
} else { /* English and default */
|
||||
ending = counted_noun_ending_en(num);
|
||||
}
|
||||
temp = alloca((temp_len = (strlen(noun) + strlen(ending) + 1)));
|
||||
temp = ast_alloca((temp_len = (strlen(noun) + strlen(ending) + 1)));
|
||||
snprintf(temp, temp_len, "%s%s", noun, ending);
|
||||
return ast_play_and_wait(chan, temp);
|
||||
}
|
||||
@@ -8370,7 +8370,7 @@ int ast_say_counted_adjective(struct ast_channel *chan, int num, const char adje
|
||||
} else { /* English and default */
|
||||
ending = "";
|
||||
}
|
||||
temp = alloca((temp_len = (strlen(adjective) + strlen(ending) + 1)));
|
||||
temp = ast_alloca((temp_len = (strlen(adjective) + strlen(ending) + 1)));
|
||||
snprintf(temp, temp_len, "%s%s", adjective, ending);
|
||||
return ast_play_and_wait(chan, temp);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user