This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] argv.c (expandargv): Check for directories passed as @-files.
- From: DJ Delorie <dj at sourceware dot org>
- To: bfd-cvs at sourceware dot org, gdb-cvs at sourceware dot org
- Date: 6 Dec 2016 06:43:48 -0000
- Subject: [binutils-gdb] argv.c (expandargv): Check for directories passed as @-files.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fc72affa6875e81fc9d495a216a8bcb34045ffcd
commit fc72affa6875e81fc9d495a216a8bcb34045ffcd
Author: DJ Delorie <dj@redhat.com>
Date: Tue Dec 6 01:40:44 2016 -0500
argv.c (expandargv): Check for directories passed as @-files.
gcc pr 78584
Diff:
---
libiberty/ChangeLog | 4 ++++
libiberty/argv.c | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
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)