kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix misuses of asprintf throughout the code.

Browse Source 
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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@371590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-08-21 20:35:12 +00:00
parent ccd68a5790
commit 3b476dfd1e
14 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -5012,8 +5012,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.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 = ',';
@@ -5023,8 +5022,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ast_exists_extension(peer, gosubexec, "~~s~~", 1, S_COR(peer->caller.id.number.valid, peer->caller.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;
}
}