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 --- pbx/pbx_lua.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pbx/pbx_lua.c') diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 928861698..1b9182794 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -303,7 +303,7 @@ static int lua_get_variable_value(lua_State *L) { struct ast_channel *chan; char *value = NULL, *name; - char *workspace = alloca(LUA_BUF_SIZE); + char *workspace = ast_alloca(LUA_BUF_SIZE); int autoservice; workspace[0] = '\0'; @@ -561,7 +561,7 @@ static int lua_get_variable(lua_State *L) struct ast_channel *chan; const char *name = luaL_checkstring(L, 2); char *value = NULL; - char *workspace = alloca(LUA_BUF_SIZE); + char *workspace = ast_alloca(LUA_BUF_SIZE); workspace[0] = '\0'; lua_getfield(L, LUA_REGISTRYINDEX, "channel"); @@ -1080,7 +1080,7 @@ static char *lua_read_extensions_file(lua_State *L, long *size) FILE *f; int error_func; char *data; - char *path = alloca(strlen(config) + strlen(ast_config_AST_CONFIG_DIR) + 2); + char *path = ast_alloca(strlen(config) + strlen(ast_config_AST_CONFIG_DIR) + 2); sprintf(path, "%s/%s", ast_config_AST_CONFIG_DIR, config); if (!(f = fopen(path, "r"))) { -- cgit v1.2.3