Module Name: src
Committed By: kre
Date: Sat May 7 20:06:30 UTC 2016
Modified Files:
src/bin/sh: input.c
Log Message:
PR bin/51119 - don't leak FDs in unusual error cases. OK christos@
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/bin/sh/input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.49 src/bin/sh/input.c:1.50
--- src/bin/sh/input.c:1.49 Mon May 2 01:46:31 2016
+++ src/bin/sh/input.c Sat May 7 20:06:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.49 2016/05/02 01:46:31 christos Exp $ */
+/* $NetBSD: input.c,v 1.50 2016/05/07 20:06:30 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#else
-__RCSID("$NetBSD: input.c,v 1.49 2016/05/02 01:46:31 christos Exp $");
+__RCSID("$NetBSD: input.c,v 1.50 2016/05/07 20:06:30 kre Exp $");
#endif
#endif /* not lint */
@@ -404,11 +404,15 @@ setinputfile(const char *fname, int push
*/
if (lseek(fd, 0, SEEK_SET) == 0) {
if (read(fd, magic, 4) == 4) {
- if (memcmp(magic, "\177ELF", 4) == 0)
+ if (memcmp(magic, "\177ELF", 4) == 0) {
+ (void)close(fd);
error("Cannot execute ELF binary %s", fname);
+ }
}
- if (lseek(fd, 0, SEEK_SET) != 0)
+ if (lseek(fd, 0, SEEK_SET) != 0) {
+ (void)close(fd);
error("Cannot rewind the file %s", fname);
+ }
}
fd2 = to_upper_fd(fd); /* closes fd, returns higher equiv */
