From 2207ff5dd1758a989e2af452eca89e0bb73da2a5 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Tue, 6 Dec 2016 01:38:23 -0500
Subject: [PATCH] * argv.c (expandargv): Check for directories passed as
 @-files.

From-SVN: r243280
---
 libiberty/ChangeLog |  4 ++++
 libiberty/argv.c    | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f0959c99f5c..e4e765a1e8d 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-30  DJ Delorie  <dj@redhat.com>
+
+	* argv.c (expandargv): Check for directories passed as @-files.
+
 2016-11-30  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c/78498
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 994dd3531c0..fd43e78b170 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -35,6 +35,13 @@ Boston, MA 02110-1301, USA.  */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #ifndef NULL
 #define NULL 0
@@ -387,6 +394,9 @@ expandargv (int *argcp, char ***argvp)
       char **file_argv;
       /* The number of options read from the response file, if any.  */
       size_t file_argc;
+#ifdef S_ISDIR
+      struct stat sb;
+#endif
       /* We are only interested in options of the form "@file".  */
       filename = (*argvp)[i];
       if (filename[0] != '@')
@@ -397,6 +407,15 @@ expandargv (int *argcp, char ***argvp)
 	  fprintf (stderr, "%s: error: too many @-files encountered\n", (*argvp)[0]);
 	  xexit (1);
 	}
+#ifdef S_ISDIR
+      if (stat (filename+1, &sb) < 0)
+	continue;
+      if (S_ISDIR(sb.st_mode))
+	{
+	  fprintf (stderr, "%s: error: @-file refers to a directory\n", (*argvp)[0]);
+	  xexit (1);
+	}
+#endif
       /* Read the contents of the file.  */
       f = fopen (++filename, "r");
       if (!f)
-- 
2.30.2