diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-10-05 16:32:24 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-10-05 16:32:24 +0000 |
| commit | a40278c3e39a5ef2a35a0f8c4e6ce359c9af9832 (patch) | |
| tree | e9f55a185d17abdba2cce6a575f56a47f70d5f69 | |
| parent | 73e1414cb829d02baef1bf241d4bdf3805f6f724 (diff) | |
| download | gcc-a40278c3e39a5ef2a35a0f8c4e6ce359c9af9832.zip gcc-a40278c3e39a5ef2a35a0f8c4e6ce359c9af9832.tar.gz gcc-a40278c3e39a5ef2a35a0f8c4e6ce359c9af9832.tar.bz2 | |
re PR libfortran/77868 (Fail to NULL guard check for internal unit in inquire_via_unit)
2016-10-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/77868
* io/inquire.c (inquire_via_unit): NULL guard the check for
internal unit passed into child IO procedure.
* gfortran.dg/dtio_15.f90: Fix spaces in dg-do.
* gfortran.dg/class_array_20.f03: Likewise.
* gfortran.dg/class_array_21.f03: Likewise.
* gfortran.dg/finalize_29.f08: Likewise.
* gfortran.dg/unlimited_polymorphic_23.f90: Likewise.
From-SVN: r240794
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_array_20.f03 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_array_21.f03 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dtio_15.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/finalize_29.f08 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/unlimited_polymorphic_23.f90 | 2 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
| -rw-r--r-- | libgfortran/io/inquire.c | 2 |
8 files changed, 21 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fa1f310..947e84c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2016-10-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + * gfortran.dg/dtio_15.f90: Fix spaces in dg-do. + * gfortran.dg/class_array_20.f03: Likewise. + * gfortran.dg/class_array_21.f03: Likewise. + * gfortran.dg/finalize_29.f08: Likewise. + * gfortran.dg/unlimited_polymorphic_23.f90: Likewise. + 2016-10-05 Richard Biener <rguenther@suse.de> PR middle-end/77826 diff --git a/gcc/testsuite/gfortran.dg/class_array_20.f03 b/gcc/testsuite/gfortran.dg/class_array_20.f03 index c49f7d2..b4be045 100644 --- a/gcc/testsuite/gfortran.dg/class_array_20.f03 +++ b/gcc/testsuite/gfortran.dg/class_array_20.f03 @@ -1,4 +1,4 @@ -! {dg-do run} +! { dg-do run } ! ! Test contributed by Thomas L. Clune via pr60322 ! and Antony Lewis via pr64692 diff --git a/gcc/testsuite/gfortran.dg/class_array_21.f03 b/gcc/testsuite/gfortran.dg/class_array_21.f03 index 1e89d38..ed03ed8 100644 --- a/gcc/testsuite/gfortran.dg/class_array_21.f03 +++ b/gcc/testsuite/gfortran.dg/class_array_21.f03 @@ -1,4 +1,4 @@ -! {dg-do run} +! { dg-do run } ! ! Contributed by Andre Vehreschild ! Check more elaborate class array addressing. diff --git a/gcc/testsuite/gfortran.dg/dtio_15.f90 b/gcc/testsuite/gfortran.dg/dtio_15.f90 index 040bb3e..776f442 100644 --- a/gcc/testsuite/gfortran.dg/dtio_15.f90 +++ b/gcc/testsuite/gfortran.dg/dtio_15.f90 @@ -1,4 +1,4 @@ -! {dg-do run } +! { dg-do run } ! Test that inquire of string internal unit in child process errors. module string_m implicit none diff --git a/gcc/testsuite/gfortran.dg/finalize_29.f08 b/gcc/testsuite/gfortran.dg/finalize_29.f08 index 1f5f7424..9640f4f 100644 --- a/gcc/testsuite/gfortran.dg/finalize_29.f08 +++ b/gcc/testsuite/gfortran.dg/finalize_29.f08 @@ -1,4 +1,4 @@ -! {dg-do run} +! { dg-do run } ! ! Testcase contributed by Andre Vehreschild <vehre@gcc.gnu.org> diff --git a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_23.f90 b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_23.f90 index 27eff31..99b5f6b 100644 --- a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_23.f90 +++ b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_23.f90 @@ -1,4 +1,4 @@ -! {dg-do run } +! { dg-do run } ! ! Test the fix for PR65024, in which the structure for the 'info' ! component of type 'T' was not being converted into TREE_SSA and diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 0e5c4d2..d38646a 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,6 +1,12 @@ +2016-10-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/77868 + * io/inquire.c (inquire_via_unit): NULL guard the check for + internal unit passed into child IO procedure. + 2016-10-04 Jerry DeLisle <jvdelisle@gcc.gnu.org> - io/inquire.c (inquire_via_unit): Add check for internal unit + * io/inquire.c (inquire_via_unit): Add check for internal unit passed into child IO procedure. 2016-10-01 Andre Vehreschild <vehre@gcc.gnu.org> diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c index 7751b8d..7e663130e 100644 --- a/libgfortran/io/inquire.c +++ b/libgfortran/io/inquire.c @@ -43,7 +43,7 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u) if (iqp->common.unit == GFC_INTERNAL_UNIT || iqp->common.unit == GFC_INTERNAL_UNIT4 || - u->internal_unit_kind != 0) + (u != NULL && u->internal_unit_kind != 0)) generate_error (&iqp->common, LIBERROR_INQUIRE_INTERNAL_UNIT, NULL); if ((cf & IOPARM_INQUIRE_HAS_EXIST) != 0) |