From da36ba2754d0ab1b9ac9603c939e8b83f1857a30 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 5 Feb 2008 21:40:45 +0100 Subject: [PATCH] re PR fortran/35093 (gfortran.dg/data_constraints_1.f90) 2008-02-05 Tobias Burnus PR fortran/35093 * data.c (gfc_assign_data_value): Only free "size" if it has not already been freed. From-SVN: r132128 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/data.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b795f897848b..72918d8287c5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-02-05 Tobias Burnus + + PR fortran/35093 + * data.c (gfc_assign_data_value): Only free "size" if + it has not already been freed. + 2008-02-05 Paul Thomas PR fortran/34945 diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 10fcd48676e4..654c4384de6e 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -321,15 +321,17 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index) else { mpz_t size; - if (spec_size (ref->u.ar.as, &size) == SUCCESS - && mpz_cmp (offset, size) >= 0) + if (spec_size (ref->u.ar.as, &size) == SUCCESS) { + if (mpz_cmp (offset, size) >= 0) + { + mpz_clear (size); + gfc_error ("Data element above array upper bound at %L", + &lvalue->where); + return FAILURE; + } mpz_clear (size); - gfc_error ("Data element above array upper bound at %L", - &lvalue->where); - return FAILURE; } - mpz_clear (size); } /* Splay tree containing offset and gfc_constructor. */ -- 2.47.2