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/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/config.c') diff --git a/main/config.c b/main/config.c index fee6d9eb7..9abc6020d 100644 --- a/main/config.c +++ b/main/config.c @@ -118,7 +118,7 @@ static void CB_ADD(struct ast_str **cb, const char *str) static void CB_ADD_LEN(struct ast_str **cb, const char *str, int len) { - char *s = alloca(len + 1); + char *s = ast_alloca(len + 1); ast_copy_string(s, str, len); ast_str_append(cb, 0, "%s", str); } @@ -3099,7 +3099,7 @@ static char *handle_cli_config_reload(struct ast_cli_entry *e, int cmd, struct a AST_LIST_LOCK(&cfmtime_head); AST_LIST_TRAVERSE(&cfmtime_head, cfmtime, list) { if (!strcmp(cfmtime->filename, a->argv[2])) { - char *buf = alloca(strlen("module reload ") + strlen(cfmtime->who_asked) + 1); + char *buf = ast_alloca(strlen("module reload ") + strlen(cfmtime->who_asked) + 1); sprintf(buf, "module reload %s", cfmtime->who_asked); ast_cli_command(a->fd, buf); } -- cgit v1.2.3