mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-15 22:38:08 +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:
@@ -148,7 +148,7 @@ static int shared_read(struct ast_channel *chan, const char *cmd, char *data, ch
|
||||
AST_STANDARD_APP_ARGS(args, data);
|
||||
|
||||
if (!ast_strlen_zero(args.chan)) {
|
||||
char *prefix = alloca(strlen(args.chan) + 2);
|
||||
char *prefix = ast_alloca(strlen(args.chan) + 2);
|
||||
sprintf(prefix, "%s-", args.chan);
|
||||
if (!(c_ref = ast_channel_get_by_name(args.chan)) && !(c_ref = ast_channel_get_by_name_prefix(prefix, strlen(prefix)))) {
|
||||
ast_log(LOG_ERROR, "Channel '%s' not found! Variable '%s' will be blank.\n", args.chan, args.var);
|
||||
@@ -206,7 +206,7 @@ static int shared_write(struct ast_channel *chan, const char *cmd, char *data, c
|
||||
AST_STANDARD_APP_ARGS(args, data);
|
||||
|
||||
if (!ast_strlen_zero(args.chan)) {
|
||||
char *prefix = alloca(strlen(args.chan) + 2);
|
||||
char *prefix = ast_alloca(strlen(args.chan) + 2);
|
||||
sprintf(prefix, "%s-", args.chan);
|
||||
if (!(c_ref = ast_channel_get_by_name(args.chan)) && !(c_ref = ast_channel_get_by_name_prefix(prefix, strlen(prefix)))) {
|
||||
ast_log(LOG_ERROR, "Channel '%s' not found! Variable '%s' not set to '%s'.\n", args.chan, args.var, value);
|
||||
|
||||
Reference in New Issue
Block a user