kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +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
........

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
This commit is contained in:
Mark Michelson
2012-08-21 21:01:11 +00:00
parent 89a5ff859d
commit 6a539ace84
14 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/file.c
View File

@@ -261,14 +261,12 @@ static char *build_filename(const char *filename, const char *ext)
ext = "WAV";
if (filename[0] == '/') {
if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
if (ast_asprintf(&fn, "%s.%s", filename, ext) < 0) {
fn = NULL;
}
} else {
if (asprintf(&fn, "%s/sounds/%s.%s",
if (ast_asprintf(&fn, "%s/sounds/%s.%s",
ast_config_AST_DATA_DIR, filename, ext) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
fn = NULL;
}
}
@@ -1070,6 +1068,9 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
format_found = 1;
fn = build_filename(filename, type);
if (!fn) {
continue;
}
errno = 0;
bfile = fopen(fn, "r");
@@ -1090,6 +1091,7 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
fs->mode = mode;
fs->filename = ast_strdup(filename);
fs->vfs = NULL;
ast_free(fn);
break;
}
@@ -1137,6 +1139,9 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
format_found = 1;
fn = build_filename(filename, type);
if (!fn) {
continue;
}
fd = open(fn, flags | myflags, mode);
if (fd > -1) {
/* fdopen() the resulting file stream */
@@ -1198,6 +1203,9 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
ast_closestream(fs);
fs = NULL;
}
if (!buf) {
ast_free(fn);
}
continue;
}
fs->trans = NULL;