From 99b41d521c30ba7e44683fa6adcd657122a92c34 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Wed, 6 Oct 2010 14:52:02 +0000 Subject: [PATCH] resolve.c (check_typebound_baseobject): Free local expr before returning. 2010-10-06 Mikael Morin * resolve.c (check_typebound_baseobject): Free local expr before returning. From-SVN: r165034 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/resolve.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 86175478a9c..6d729de660c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2010-10-06 Mikael Morin + + * resolve.c (check_typebound_baseobject): Free local expr before + returning. + 2010-10-06 Mikael Morin * primary.c (gfc_match_structure_constructor): Invert the assert logic. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5cac71e51a9..203f294200a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5404,6 +5404,7 @@ static gfc_try check_typebound_baseobject (gfc_expr* e) { gfc_expr* base; + gfc_try return_value = FAILURE; base = extract_compcall_passed_object (e); if (!base) @@ -5415,7 +5416,7 @@ check_typebound_baseobject (gfc_expr* e) { gfc_error ("Base object for type-bound procedure call at %L is of" " ABSTRACT type '%s'", &e->where, base->ts.u.derived->name); - return FAILURE; + goto cleanup; } /* If the procedure called is NOPASS, the base object must be scalar. */ @@ -5423,7 +5424,7 @@ check_typebound_baseobject (gfc_expr* e) { gfc_error ("Base object for NOPASS type-bound procedure call at %L must" " be scalar", &e->where); - return FAILURE; + goto cleanup; } /* FIXME: Remove once PR 41177 (this problem) is fixed completely. */ @@ -5431,10 +5432,14 @@ check_typebound_baseobject (gfc_expr* e) { gfc_error ("Non-scalar base object at %L currently not implemented", &e->where); - return FAILURE; + goto cleanup; } - return SUCCESS; + return_value = SUCCESS; + +cleanup: + gfc_free_expr (base); + return return_value; } -- 2.30.2