Avoid an fd leak in fopen_cloexec_for_read_only.

* xargs/xargs.c (fopen_cloexec_for_read_only): when fdopen fails,
close the file descriptor instead of leaking it.  Also, use GNU-style
brace positioning. Both problems were noticed by Paul Eggert.

1 files changed, 17 insertions, 2 deletions

diff --git a/xargs/xargs.c b/xargs/xargs.c
index bf130e05..5f3e7601 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -367,9 +367,24 @@ smaller_of (size_t a, size_t b)
 }
 
 
-static FILE* fopen_cloexec_for_read_only (const char *file_name) {
+static FILE* fopen_cloexec_for_read_only (const char *file_name)
+{
   int fd = open_cloexec (file_name, O_RDONLY);
-  return (fd < 0) ? NULL : fdopen (fd, "r");
+  if (fd < 0)
+    {
+      return NULL;
+    }
+  else
+    {
+      FILE *result = fdopen (fd, "r");
+      if (!result)
+	{
+	  int saved_errno = errno;
+	  close (fd);
+	  errno = saved_errno;
+	  return NULL;
+	}
+    }
 }