From 9b16c8b0f6c3b6310e303411421bfcb16b26c3c4 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Tue, 31 Jul 2012 20:21:43 +0000 Subject: 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 --- main/say.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/say.c') 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); } -- cgit v1.2.3