ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

files: don't try to open a negative file descriptor [coverity scan]

master
Benno Schulenberg 2017-08-15 13:46:20 +02:00
parent dbbe267d71
commit de57d8b722
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/files.c
View File

@ -1604,7 +1604,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
(method != OVERWRITE || openfile->mark_set || (method != OVERWRITE || openfile->mark_set ||
openfile->current_stat->st_mtime == st.st_mtime)) { openfile->current_stat->st_mtime == st.st_mtime)) {
int backup_fd; int backup_fd;
FILE *backup_file; FILE *backup_file = NULL;
char *backupname; char *backupname;
static struct timespec filetime[2]; static struct timespec filetime[2];
int backup_cflags; int backup_cflags;
@ -1695,11 +1695,11 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
backup_fd = open(backupname, backup_cflags, backup_fd = open(backupname, backup_cflags,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
/* Now we've got a safe file stream. If the previous open()
* call failed, this will return NULL. */ if (backup_fd >= 0)
backup_file = fdopen(backup_fd, "wb"); backup_file = fdopen(backup_fd, "wb");
if (backup_fd < 0 || backup_file == NULL) { if (backup_file == NULL) {
statusline(HUSH, _("Error writing backup file %s: %s"), statusline(HUSH, _("Error writing backup file %s: %s"),
backupname, strerror(errno)); backupname, strerror(errno));
free(backupname); free(backupname);