diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
| commit | 9b16c8b0f6c3b6310e303411421bfcb16b26c3c4 (patch) | |
| tree | 273c31a834a21bd2239ec6b83cd35c602ea25d26 /main/say.c | |
| parent | 6c23a60f802e7708389b1a6463a40dc0500512bd (diff) | |
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
Diffstat (limited to 'main/say.c')
| -rw-r--r-- | main/say.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/say.c b/main/say.c index 0f20d9536..d8122e3da 100644 --- a/main/say.c +++ b/main/say.c @@ -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); } |