Skip to content

Commit

Permalink
argv.c (expandargv): Check for directories passed as @-files.
Browse files Browse the repository at this point in the history
gcc pr 78584
  • Loading branch information
djdelorierh committed Dec 6, 2016
1 parent e99f7af commit fc72aff
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
4 changes: 4 additions & 0 deletions 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>

Expand Down
19 changes: 19 additions & 0 deletions libiberty/argv.c
Expand Up @@ -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
Expand Down Expand Up @@ -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] != '@')
Expand All @@ -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)
Expand Down

0 comments on commit fc72aff

Please sign in to comment.