diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-08-21 21:01:11 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-08-21 21:01:11 +0000 |
| commit | 6a539ace84035883c6f95eee21f5072a9f8fe812 (patch) | |
| tree | d57065626b02f4ab9e372036d5a76621c07e3347 /funcs/func_odbc.c | |
| parent | 89a5ff859d4e6a66c813f5b240d8c9f6ddb119a3 (diff) | |
Fix misuses of asprintf throughout the code.
This fixes three main issues
* Change asprintf() uses to ast_asprintf() so that it
pairs properly with ast_free() and no longer causes
MALLOC_DEBUG to freak out.
* When ast_asprintf() fails, set the pointer NULL if
it will be referenced later.
* Fix some memory leaks that were spotted while taking
care of the first two points.
(Closes issue ASTERISK-20135)
reported by Richard Mudgett
Review: https://reviewboard.asterisk.org/r/2071
........
Merged revisions 371590 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 371591 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 371592 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_odbc.c')
| -rw-r--r-- | funcs/func_odbc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index d6a11cd1a..4469ca7a2 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -953,12 +953,12 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu } if ((tmp = ast_variable_retrieve(cfg, catg, "prefix")) && !ast_strlen_zero(tmp)) { - if (asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg) < 0) { + (*query)->acf->name = NULL; } } else { - if (asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg) < 0) { + (*query)->acf->name = NULL; } } |