From 8b3d8fa8ac39a5cd9e127153b6cd32bb52d4ade2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 14 Mar 2005 12:29:13 +0000 Subject: [PATCH] * ldexp.c (exp_fold_tree): Ensure return value is initialized. Tidy etree_assert case. --- ld/ChangeLog | 5 +++++ ld/ldexp.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6b1fbd3..1eb4050 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2005-03-14 Alan Modra + * ldexp.c (exp_fold_tree): Ensure return value is initialized. + Tidy etree_assert case. + +2005-03-14 Alan Modra + * po/tr.po: Commit new Turkish translation. 2005-03-11 Daniel Jacobowitz diff --git a/ld/ldexp.c b/ld/ldexp.c index ec25557..b194bec 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -699,7 +699,7 @@ exp_fold_tree (etree_type *tree, if (tree == NULL) { - result.valid_p = FALSE; + memset (&result, 0, sizeof (result)); return result; } @@ -711,7 +711,7 @@ exp_fold_tree (etree_type *tree, case etree_rel: if (allocation_done != lang_final_phase_enum) - result.valid_p = FALSE; + memset (&result, 0, sizeof (result)); else result = new_rel ((tree->rel.value + tree->rel.section->output_section->vma @@ -724,12 +724,8 @@ exp_fold_tree (etree_type *tree, result = exp_fold_tree (tree->assert_s.child, current_section, allocation_done, dot, dotp); - if (result.valid_p) - { - if (! result.value) - einfo ("%X%P: %s\n", tree->assert_s.message); - return result; - } + if (result.valid_p && !result.value) + einfo ("%X%P: %s\n", tree->assert_s.message); break; case etree_unary: @@ -787,6 +783,8 @@ exp_fold_tree (etree_type *tree, } } } + else + memset (&result, 0, sizeof (result)); } else { @@ -839,6 +837,7 @@ exp_fold_tree (etree_type *tree, default: FAIL (); + memset (&result, 0, sizeof (result)); break; } -- 2.7.4