Align handling of invalid files between analyse_macho and analyse_elf

ifreund · Dec 6, 2024 · e518c4c · e518c4c
1 parent 306fc12
commit e518c4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/libpkg/binfmt_macho.c b/libpkg/binfmt_macho.c
@@ -61,8 +61,14 @@ read_fully(const int fd, const size_t len, void *dest)
 	ssize_t x;
 	while (n > 0) {
 		if ((x = read(fd, p, n)) < 0) {
+			if ( EAGAIN == errno) {
+				continue;
+			}
 			return x;
 		}
+		if ( 0 == x) {
+			return -1;
+		}
 		n -= x;
 		p += x;
 	}

diff --git a/libpkg/pkg_abi_macho.c b/libpkg/pkg_abi_macho.c
@@ -455,12 +455,14 @@ pkg_analyse_macho(const bool developer_mode, struct pkg *pkg, const char *fpath)
 
 	int fd = open(fpath, O_RDONLY);
 	if (-1 == fd) {
-		pkg_emit_errno("open", fpath);
-		ret = EPKG_FATAL;
+		// pkg_emit_errno("open_pkg_analyse_macho", fpath);
+		// ret = EPKG_FATAL;
+		// Be consistent with analyse_elf and return no error if fpath cannot be opened
+		return ret;
 	} else {
 		ret = analyse_macho(fd, pkg, baselibs);
 		if (-1 == close(fd)) {
-			pkg_emit_errno("open", fpath);
+			pkg_emit_errno("close_pkg_analyse_macho", fpath);
 			ret = EPKG_FATAL;
 		}
 	}