diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2015-07-14 23:26:06 +0300 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2015-07-14 23:26:06 +0300 |
| commit | 5fd6ec3e4b29ed0e4ba1ca81d642ee718004db7d (patch) | |
| tree | ee02c3ee48d669a7eb32f32bdba9440b622651bc /libgfortran | |
| parent | 5faebb89f57ead4ac4ddfb88c2e9037cac2724ba (diff) | |
| download | gcc-5fd6ec3e4b29ed0e4ba1ca81d642ee718004db7d.zip gcc-5fd6ec3e4b29ed0e4ba1ca81d642ee718004db7d.tar.gz gcc-5fd6ec3e4b29ed0e4ba1ca81d642ee718004db7d.tar.bz2 | |
PR 66861 Fix null pointer crash on mingw.
2015-07-14 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/66861
* io/unix.c (compare_file_filename): Verify that u->filename is
non-NULL before strcmp.
(find_file0): Likewise.
From-SVN: r225788
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index ae0d853..876b2c9 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2015-07-14 Janne Blomqvist <jb@gcc.gnu.org> + + PR libfortran/66861 + * io/unix.c (compare_file_filename): Verify that u->filename is + non-NULL before strcmp. + (find_file0): Likewise. + 2015-07-06 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR libfortran/40267 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index e5fc6e1..a1ce9a3 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -1525,7 +1525,10 @@ compare_file_filename (gfc_unit *u, const char *name, int len) goto done; } # endif - ret = (strcmp(path, u->filename) == 0); + if (u->filename) + ret = (strcmp(path, u->filename) == 0); + else + ret = 0; #endif done: free (path); @@ -1570,7 +1573,7 @@ find_file0 (gfc_unit *u, FIND_FILE0_DECL) } else # endif - if (strcmp (u->filename, path) == 0) + if (u->filename && strcmp (u->filename, path) == 0) return u; #endif |