From 6a2bf10f40d53afedc94759ac13649badfda7b7d Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 22 Jul 2013 15:03:50 +0200 Subject: [PATCH] trans-array.c (gfc_array_allocate, [...]): Plug memory leak. 2013-07-22 Tobias Burnus * trans-array.c (gfc_array_allocate, gfc_trans_deferred_array): Plug memory leak. From-SVN: r201125 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-array.c | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 85dc3c84e210..b75ffc249c55 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2013-07-22 Tobias Burnus + + * trans-array.c (gfc_array_allocate, + gfc_trans_deferred_array): Plug memory leak. + 2013-07-21 Ondřej Bílka * trans-decl.c: Fix comment typos. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 5cc174fa7ca6..5bcd67ddd593 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5209,7 +5209,7 @@ gfc_array_allocate (gfc_se * se, gfc_expr * expr, tree status, tree errmsg, &se->pre, &set_descriptor_block, &overflow, expr3_elem_size, nelems, expr3, ts); - if (dimension) + if (status == NULL_TREE && dimension) { var_overflow = gfc_create_var (integer_type_node, "overflow"); @@ -5223,8 +5223,7 @@ gfc_array_allocate (gfc_se * se, gfc_expr * expr, tree status, tree errmsg, error = build_call_expr_loc (input_location, gfor_fndecl_runtime_error, 1, msg); } - - if (status != NULL_TREE) + else if (status != NULL_TREE) { tree status_type = TREE_TYPE (status); stmtblock_t set_status_block; @@ -8525,10 +8524,12 @@ gfc_trans_deferred_array (gfc_symbol * sym, gfc_wrapped_block * block) && !sym->attr.save && !sym->attr.result && !sym->ns->proc_name->attr.is_main_program) { + gfc_expr *e; + e = has_finalizer ? gfc_lval_expr_from_sym (sym) : NULL; tmp = gfc_trans_dealloc_allocated (sym->backend_decl, - sym->attr.codimension, - has_finalizer - ? gfc_lval_expr_from_sym (sym) : NULL); + sym->attr.codimension, e); + if (e) + gfc_free_expr (e); gfc_add_expr_to_block (&cleanup, tmp); }