aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/data.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2012-08-28 16:49:15 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2012-08-28 16:49:15 +0200
commit46f4f794839998430e405d13d0f1b449f48a13c4 (patch)
tree1235ae5b42a3961dbe50871871e9c6c717ed22f4 /gcc/fortran/data.c
parent94c15c51f92331fa0084b5eb467e5581f00aebf6 (diff)
downloadgcc-46f4f794839998430e405d13d0f1b449f48a13c4.zip
gcc-46f4f794839998430e405d13d0f1b449f48a13c4.tar.gz
gcc-46f4f794839998430e405d13d0f1b449f48a13c4.tar.bz2
re PR fortran/54384 (gfortran memory leaks)
2012-08-28 Tobias Burnus <burnus@net-b.de> PR fortran/54384 * decl.c (match_data_constant): Add missing gfc_free_expr. (top_val_list): Remove always-true condition. * data.c (get_array_index, create_character_initializer): Free temporary expressions. (gfc_assign_data_value): Free expression when aborting. From-SVN: r190751
Diffstat (limited to 'gcc/fortran/data.c')
-rw-r--r--gcc/fortran/data.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 385ca89..de8c0ca8 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -66,6 +66,7 @@ get_array_index (gfc_array_ref *ar, mpz_t *offset)
gfc_error ("non-constant array in DATA statement %L", &ar->where);
mpz_set (tmp, e->value.integer);
+ gfc_free_expr (e);
mpz_sub (tmp, tmp, ar->as->lower[i]->value.integer);
mpz_mul (tmp, tmp, delta);
mpz_add (*offset, tmp, *offset);
@@ -138,8 +139,10 @@ create_character_initializer (gfc_expr *init, gfc_typespec *ts,
}
gfc_extract_int (start_expr, &start);
+ gfc_free_expr (start_expr);
start--;
gfc_extract_int (end_expr, &end);
+ gfc_free_expr (end_expr);
}
else
{
@@ -200,7 +203,7 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index,
{
gfc_ref *ref;
gfc_expr *init;
- gfc_expr *expr;
+ gfc_expr *expr = NULL;
gfc_constructor *con;
gfc_constructor *last_con;
gfc_symbol *symbol;
@@ -500,6 +503,8 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index,
return SUCCESS;
abort:
+ if (!init)
+ gfc_free_expr (expr);
mpz_clear (offset);
return FAILURE;
}