talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cp: avoid a resource leak 

In copy_file(), make sure the from_fd file descriptor is closed even
when the operation failed early.

Reported by:	Coverity Scan
CID:		1545036
Sponsored by:	The FreeBSD Foundation

Reviewed by: imp, emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/1238
This commit is contained in:
Pierre Pronchery 2024-05-16 16:19:44 +02:00 committed by Warner Losh
parent a5f03413aa
commit 3d7c8f0887
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/cp/utils.c
View File

@ -112,6 +112,8 @@ copy_file(const FTSENT *entp, int dne)
if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 ||
fstat(from_fd, &sb) != 0) {
warn("%s", entp->fts_path);
if (from_fd >= 0)
(void)close(from_fd);
return (1);
}
/*
@ -124,6 +126,7 @@ copy_file(const FTSENT *entp, int dne)
*/
if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) {
warnx("%s: File changed", entp->fts_path);
(void)close(from_fd);
return (1);
}
}