diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-03-13 17:38:07 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-03-13 17:38:07 +0000 |
| commit | 44e66a770938dabebfb572619c4c2f0f2492aec2 (patch) | |
| tree | 7880c8ac436cbf2e236c6f8336abc9f0d89b53eb /gcc/fortran/scanner.c | |
| parent | a18e0fe1e4f3788fbc6ca10d8c7671885ed9baea (diff) | |
| download | gcc-44e66a770938dabebfb572619c4c2f0f2492aec2.zip gcc-44e66a770938dabebfb572619c4c2f0f2492aec2.tar.gz gcc-44e66a770938dabebfb572619c4c2f0f2492aec2.tar.bz2 | |
re PR fortran/69043 (Trying to include a directory causes an infinite loop)
2016-03-13 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Jim MacArthur <jim.macarthur@codethink.co.uk>
PR fortran/69043
* scanner.c (load_file): Check that included file is regular.
PR fortran/69043
* gfortran.dg/include_9.f90: New test.
Co-Authored-By: Jim MacArthur <jim.macarthur@codethink.co.uk>
From-SVN: r234169
Diffstat (limited to 'gcc/fortran/scanner.c')
| -rw-r--r-- | gcc/fortran/scanner.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index c4e7974..33d96d8 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -2200,6 +2200,8 @@ load_file (const char *realfilename, const char *displayedname, bool initial) FILE *input; int len, line_len; bool first_line; + struct stat st; + int stat_result; const char *filename; /* If realfilename and displayedname are different and non-null then surely realfilename is the preprocessed form of @@ -2227,6 +2229,7 @@ load_file (const char *realfilename, const char *displayedname, bool initial) } else input = gfc_open_file (realfilename); + if (input == NULL) { gfc_error_now ("Can't open file %qs", filename); @@ -2242,6 +2245,15 @@ load_file (const char *realfilename, const char *displayedname, bool initial) current_file->filename, current_file->line, filename); return false; } + stat_result = stat (realfilename, &st); + if (stat_result == 0 && !(st.st_mode & S_IFREG)) + { + fprintf (stderr, "%s:%d: Error: Included path '%s'" + " is not a regular file\n", + current_file->filename, current_file->line, filename); + fclose (input); + return false; + } } /* Load the file. |