aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2016-12-06 01:40:44 -0500
committerDJ Delorie <dj@redhat.com>2016-12-06 01:40:44 -0500
commitfc72affa6875e81fc9d495a216a8bcb34045ffcd (patch)
treebef0086803952be0e6b294f97ee54e2a9c5c8dc2 /libiberty
parente99f7af2bfbdb08c9cc454d6e5c82e70d34b957e (diff)
downloadfsf-binutils-gdb-fc72affa6875e81fc9d495a216a8bcb34045ffcd.zip
fsf-binutils-gdb-fc72affa6875e81fc9d495a216a8bcb34045ffcd.tar.gz
fsf-binutils-gdb-fc72affa6875e81fc9d495a216a8bcb34045ffcd.tar.bz2
argv.c (expandargv): Check for directories passed as @-files.
gcc pr 78584
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/argv.c19
2 files changed, 23 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7ae91ad..f800e0c 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-06 DJ Delorie <dj@redhat.com>
+
+ * argv.c (expandargv): Check for directories passed as @-files.
+
2016-11-03 David Tolnay <dtolnay@gmail.com>
Mark Wielaard <mark@klomp.org>
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 994dd35..fd43e78 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)