kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_voicemail: Fix file copy error handling.

Browse Source 
Fix error where input/output file descriptors would be closed multiple
times.

Change-Id: Iba5140b60cb7de79e3d5d92be3c256947aa99da9
This commit is contained in:
Corey Farrell
2017-12-20 22:11:48 -05:00
parent 4815be9aeb
commit f2f51ff4ea
1 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
apps/app_voicemail.c
View File

@@ -4647,49 +4647,56 @@ static int copy(char *infile, char *outfile)
{ {
int ifd; int ifd;
int ofd; int ofd;
int res; int res = -1;
int len; int len;
char buf[4096]; char buf[4096];
#ifdef HARDLINK_WHEN_POSSIBLE #ifdef HARDLINK_WHEN_POSSIBLE
/* Hard link if possible; saves disk space & is faster */ /* Hard link if possible; saves disk space & is faster */
if (link(infile, outfile)) { if (!link(infile, outfile)) {
#endif
if ((ifd = open(infile, O_RDONLY)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to open %s in read-only mode: %s\n", infile, strerror(errno));
return -1;
}
if ((ofd = open(outfile, O_WRONLY | O_TRUNC | O_CREAT, VOICEMAIL_FILE_MODE)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to open %s in write-only mode: %s\n", outfile, strerror(errno));
close(ifd);
return -1;
}
do {
len = read(ifd, buf, sizeof(buf));
if (len < 0) {
ast_log(AST_LOG_WARNING, "Read failed on %s: %s\n", infile, strerror(errno));
close(ifd);
close(ofd);
unlink(outfile);
} else if (len) {
res = write(ofd, buf, len);
if (errno == ENOMEM || errno == ENOSPC || res != len) {
ast_log(AST_LOG_WARNING, "Write failed on %s (%d of %d): %s\n", outfile, res, len, strerror(errno));
close(ifd);
close(ofd);
unlink(outfile);
}
}
} while (len);
close(ifd);
close(ofd);
return 0;
#ifdef HARDLINK_WHEN_POSSIBLE
} else {
/* Hard link succeeded */
return 0; return 0;
} }
#endif #endif
if ((ifd = open(infile, O_RDONLY)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to open %s in read-only mode: %s\n", infile, strerror(errno));
return -1;
}
if ((ofd = open(outfile, O_WRONLY | O_TRUNC | O_CREAT, VOICEMAIL_FILE_MODE)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to open %s in write-only mode: %s\n", outfile, strerror(errno));
close(ifd);
return -1;
}
for (;;) {
int wrlen;
len = read(ifd, buf, sizeof(buf));
if (!len) {
res = 0;
break;
}
if (len < 0) {
ast_log(AST_LOG_WARNING, "Read failed on %s: %s\n", infile, strerror(errno));
break;
}
wrlen = write(ofd, buf, len);
if (errno == ENOMEM || errno == ENOSPC || wrlen != len) {
ast_log(AST_LOG_WARNING, "Write failed on %s (%d of %d): %s\n", outfile, wrlen, len, strerror(errno));
break;
}
}
close(ifd);
close(ofd);
if (res) {
unlink(outfile);
}
return res;
} }
/*! /*!