6724cf9 Close file descriptor leak — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Close file descriptor leak

Baptiste Daroussin committed 9 years ago

commit 6724cf95c993fd7e541def65ccc7c1fca3eca2de
parent d0cdca9

1 file changed +4 -1

modified libpkg/pkg_add.c

@@ -1338,8 +1338,10 @@ pkg_add_fromdir(struct pkg *pkg, const char *src)

 			}
 			kh_find(hls, hardlinks, st.st_ino, path);
 			if (path != NULL) {
 				if (create_hardlink(pkg, f, path) == EPKG_FATAL)
 				if (create_hardlink(pkg, f, path) == EPKG_FATAL) {
 					close(fd);
 					return (EPKG_FATAL);
 				}
 			} else {
 				if (create_regfile(pkg, f, NULL, NULL, fd, NULL) == EPKG_FATAL) {
 					close(fd);

@@ -1347,6 +1349,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src)

 				}
 				kh_safe_add(hls, hardlinks, f->path, st.st_ino);
 			}
 			close(fd);
 		} else {
 			pkg_emit_error("Invalid file type");
 			return (EPKG_FATAL);