From d7920cf0719e3cc28e61a98d640f6d1cb46d797e Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 27 Aug 2012 22:51:52 +0200 Subject: [PATCH] re PR fortran/54384 (gfortran memory leaks) 2012-08-27 Tobias Burnus PR fortran/54384 * resolve.c (gfc_resolve_character_operator): Free temporary variables. * trans-expr.c (gfc_conv_statement_function): Ditto. From-SVN: r190731 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/resolve.c | 7 ++++++- gcc/fortran/trans-expr.c | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d384d388232b..68d1f75c03dd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-08-27 Tobias Burnus + + PR fortran/54384 + * resolve.c (gfc_resolve_character_operator): Free temporary + variables. + * trans-expr.c (gfc_conv_statement_function): Ditto. + 2012-08-27 Tobias Burnus PR fortran/54384 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 63b730c6e3b2..312713bcc549 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5593,7 +5593,12 @@ gfc_resolve_character_operator (gfc_expr *e) e->ts.u.cl = gfc_new_charlen (gfc_current_ns, NULL); if (!e1 || !e2) - return; + { + gfc_free_expr (e1); + gfc_free_expr (e2); + + return; + } e->ts.u.cl->length = gfc_add (e1, e2); e->ts.u.cl->length->ts.type = BT_INTEGER; diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 3ab7d5d5b741..84a4b34bbb2b 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -5080,6 +5080,7 @@ gfc_conv_statement_function (gfc_se * se, gfc_expr * expr) /* Restore the original variables. */ for (fargs = sym->formal, n = 0; fargs; fargs = fargs->next, n++) gfc_restore_sym (fargs->sym, &saved_vars[n]); + free (temp_vars); free (saved_vars); } -- 2.47.2