From 6a539ace84035883c6f95eee21f5072a9f8fe812 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 21 Aug 2012 21:01:11 +0000 Subject: 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 --- pbx/pbx_config.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pbx') diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 014f7f6e1..b3cc211b0 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -472,14 +472,12 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a) if (++which > a->n) { /* If there is an extension then return exten@context. */ if (ast_get_extension_matchcid(e) && (!strchr(a->word, '@') || strchr(a->word, '/'))) { - if (asprintf(&ret, "%s/%s@%s", ast_get_extension_name(e), ast_get_extension_cidmatch(e), ast_get_context_name(c)) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&ret, "%s/%s@%s", ast_get_extension_name(e), ast_get_extension_cidmatch(e), ast_get_context_name(c)) < 0) { ret = NULL; } break; } else if (!ast_get_extension_matchcid(e) && !strchr(a->word, '/')) { - if (asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c)) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c)) < 0) { ret = NULL; } break; -- cgit v1.2.3