kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and ensure proper usage of alloca()

Browse Source 
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:
Kinsey Moore
2012-07-31 20:21:43 +00:00
parent 6c23a60f80
commit 9b16c8b0f6
64 changed files with 317 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
funcs/func_logic.c
View File

@@ -250,17 +250,15 @@ static int import_helper(struct ast_channel *chan, const char *cmd, char *data,
struct ast_channel *chan2;
if ((chan2 = ast_channel_get_by_name(args.channel))) {
char *s = alloca(strlen(args.varname) + 4);
if (s) {
sprintf(s, "${%s}", args.varname);
ast_channel_lock(chan2);
if (buf) {
pbx_substitute_variables_helper(chan2, s, buf, len);
} else {
ast_str_substitute_variables(str, len, chan2, s);
}
ast_channel_unlock(chan2);
char *s = ast_alloca(strlen(args.varname) + 4);
sprintf(s, "${%s}", args.varname);
ast_channel_lock(chan2);
if (buf) {
pbx_substitute_variables_helper(chan2, s, buf, len);
} else {
ast_str_substitute_variables(str, len, chan2, s);
}
ast_channel_unlock(chan2);
chan2 = ast_channel_unref(chan2);
}
}