diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/der_ptr_component_2.f90 | 30 |
4 files changed, 51 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ff47dc4..63af2ae 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2017-02-05 Andre Vehreschild <vehre@gcc.gnu.org> + + PR fortran/79230 + * trans-array.c (structure_alloc_comps): Ignore pointer components when + freeing structures. + 2017-01-25 Maxim Ostapenko <m.ostapenko@samsung.com> PR lto/79061 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index a3aab8e..d0dfc26 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -8220,9 +8220,17 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl, /* Shortcut to get the attributes of the component. */ if (c->ts.type == BT_CLASS) - attr = &CLASS_DATA (c)->attr; + { + attr = &CLASS_DATA (c)->attr; + if (attr->class_pointer) + continue; + } else - attr = &c->attr; + { + attr = &c->attr; + if (attr->pointer) + continue; + } if ((c->ts.type == BT_DERIVED && !c->attr.pointer) || (c->ts.type == BT_CLASS && !CLASS_DATA (c)->attr.class_pointer)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 77aba28..af60081 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-05 Andre Vehreschild <vehre@gcc.gnu.org> + + PR fortran/79230 + * gfortran.dg/der_ptr_component_2.f90: New test. + 2017-02-05 Eric Botcazou <ebotcazou@adacore.com> * gcc.target/sparc/20170205-1.c: New test. diff --git a/gcc/testsuite/gfortran.dg/der_ptr_component_2.f90 b/gcc/testsuite/gfortran.dg/der_ptr_component_2.f90 new file mode 100644 index 0000000..4eb0869 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/der_ptr_component_2.f90 @@ -0,0 +1,30 @@ +! { dg-do run } +! +! Freeing the width_data lead to double free. This testcase tests that +! pr79230 is fixed now. + +program main_ut + implicit none + + type :: data_t + character, allocatable :: c1 + end type + + type :: t1_t + character, allocatable :: c2 + class(data_t), pointer :: width_data + end type + + call evaluator + +contains + + subroutine evaluator + type(data_t), target :: par_real + type(t1_t) :: field + field%width_data => par_real + end subroutine + +end + + |