Minor fix in io.c.

2 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6df5d592..6dfee660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,19 @@
 2013-05-30         Arnold D. Robbins     <arnold@skeeve.com>
 
+	More profiling fixes:
+
 	* profile.c (pprint): For Op_in_array, parenthesize subscript if
 	the precedence is lower. E.g.:  (c = tolower(foo)) in ARRAY.
 	(prec_level): Merge cases for precedence of 5.
 	(parenthesize): Simplify, as in 3.1.8. Avoids stuff like
 	`(x == 1 && (z ==2 && (q == 4 && w == 7)))'.
 
+	Unrelated:
+
+	* io.c (iop_finish): fstat the fd before closing it to avoid
+	errors on some operating systems. Thanks to Eli Zaretskii
+	for the report.
+
 2013-05-29         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* profile.c (pp_group3): Renamed from pp_concat. Change all calls.
diff --git a/io.c b/io.c
index 333d8704..4f682622 100644
--- a/io.c
+++ b/io.c
@@ -2912,8 +2912,18 @@ iop_finish(IOBUF *iop)
 			if (isdir)
 				iop->errcode = EISDIR;
 			else {
+				struct stat sbuf;
+
 				iop->errcode = EIO;
-				(void) close(iop->public.fd);
+				/*
+				 * Extensions can supply values that are not
+				 * INVALID_HANDLE but that are also not real
+				 * file descriptors. So check the fd before
+				 * trying to close it, which avoids errors
+				 * on some operating systems.
+				 */
+				if (fstat(iop->public.fd, & sbuf) == 0)
+					(void) close(iop->public.fd);
 				iop->public.fd = INVALID_HANDLE;
 			}
 			/*