From ec28f57c419f382c301ed7ef060d89c4172c36fa Mon Sep 17 00:00:00 2001 From: "Eliel C. Sardanons" Date: Tue, 9 Dec 2008 14:49:30 +0000 Subject: [PATCH] Avoid allocating memory for a thread that don't need it. Also, this memory was not being freed until the main thread ends. (That is never). (closes issue #14040) Reported by: eliel Patches: func_odbc.c.patch uploaded by eliel (license 64) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@161947 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_odbc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index e0f4eb3020..36f530c6a8 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -963,7 +963,7 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args AST_DECLARE_APP_ARGS(args, AST_APP_ARG(field)[100]; ); - struct ast_str *sql = ast_str_thread_get(&sql_buf, 16); + struct ast_str *sql; char *char_args, varname[10]; struct acf_odbc_query *query; struct ast_channel *chan; @@ -1005,6 +1005,11 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args return CLI_SHOWUSAGE; } + sql = ast_str_thread_get(&sql_buf, 16); + if (!sql) { + return CLI_FAILURE; + } + AST_RWLIST_RDLOCK(&queries); AST_RWLIST_TRAVERSE(&queries, query, list) { if (!strcmp(query->acf->name, a->argv[2])) { @@ -1156,7 +1161,7 @@ static char *cli_odbc_write(struct ast_cli_entry *e, int cmd, struct ast_cli_arg AST_DECLARE_APP_ARGS(args, AST_APP_ARG(field)[100]; ); - struct ast_str *sql = ast_str_thread_get(&sql_buf, 16); + struct ast_str *sql; char *char_args, *char_values, varname[10]; struct acf_odbc_query *query; struct ast_channel *chan; @@ -1198,6 +1203,11 @@ static char *cli_odbc_write(struct ast_cli_entry *e, int cmd, struct ast_cli_arg return CLI_SHOWUSAGE; } + sql = ast_str_thread_get(&sql_buf, 16); + if (!sql) { + return CLI_FAILURE; + } + AST_RWLIST_RDLOCK(&queries); AST_RWLIST_TRAVERSE(&queries, query, list) { if (!strcmp(query->acf->name, a->argv[2])) {