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 /apps | |
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 'apps')
-rw-r--r-- | apps/app_dial.c | 6 | ||||
-rw-r--r-- | apps/app_queue.c | 6 | ||||
-rw-r--r-- | apps/app_stack.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 23a6c68b0..355c77fa1 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2900,8 +2900,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast ast_exists_extension(peer, opt_args[OPT_ARG_CALLEE_GOSUB], "~~s~~", 1, S_COR(ast_channel_caller(peer)->id.number.valid, ast_channel_caller(peer)->id.number.str, NULL))) { what_is_s = "~~s~~"; } - if (asprintf(&gosub_args, "%s,%s,1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s, gosub_argstart + 1) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s, gosub_argstart + 1) < 0) { gosub_args = NULL; } *gosub_argstart = ','; @@ -2911,8 +2910,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast ast_exists_extension(peer, opt_args[OPT_ARG_CALLEE_GOSUB], "~~s~~", 1, S_COR(ast_channel_caller(peer)->id.number.valid, ast_channel_caller(peer)->id.number.str, NULL))) { what_is_s = "~~s~~"; } - if (asprintf(&gosub_args, "%s,%s,1", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,1", opt_args[OPT_ARG_CALLEE_GOSUB], what_is_s) < 0) { gosub_args = NULL; } } diff --git a/apps/app_queue.c b/apps/app_queue.c index 6265308b7..d96f287d2 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -5517,8 +5517,7 @@ static int try_calling(struct queue_ent *qe, const struct ast_flags opts, char * ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(ast_channel_caller(peer)->id.number.valid, ast_channel_caller(peer)->id.number.str, NULL))) { what_is_s = "~~s~~"; } - if (asprintf(&gosub_args, "%s,%s,1(%s)", gosubexec, what_is_s, gosub_argstart + 1) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,1(%s)", gosubexec, what_is_s, gosub_argstart + 1) < 0) { gosub_args = NULL; } *gosub_argstart = ','; @@ -5528,8 +5527,7 @@ static int try_calling(struct queue_ent *qe, const struct ast_flags opts, char * ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(ast_channel_caller(peer)->id.number.valid, ast_channel_caller(peer)->id.number.str, NULL))) { what_is_s = "~~s~~"; } - if (asprintf(&gosub_args, "%s,%s,1", gosubexec, what_is_s) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,1", gosubexec, what_is_s) < 0) { gosub_args = NULL; } } diff --git a/apps/app_stack.c b/apps/app_stack.c index e32d56dd7..73731be6b 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1094,13 +1094,11 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, const char } if (argc == 5) { - if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority, argv[4]) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority, argv[4]) < 0) { gosub_args = NULL; } } else { - if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority) < 0) { - ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno)); + if (ast_asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority) < 0) { gosub_args = NULL; } } |