diff options
author | Alan Modra <amodra@bigpond.net.au> | 2005-03-14 12:29:13 +0000 |
---|---|---|
committer | Alan Modra <amodra@bigpond.net.au> | 2005-03-14 12:29:13 +0000 |
commit | 58f439db62c8076a08a97c334ad047ee9e4bdb9e (patch) | |
tree | e21b71055fa270beee4e6d269724556f14fa725a /ld/ldexp.c | |
parent | ca9d890bdfe01a8b88c72e55347be722df9768cb (diff) | |
download | binutils-redhat-58f439db62c8076a08a97c334ad047ee9e4bdb9e.tar.gz |
* ldexp.c (exp_fold_tree): Ensure return value is initialized.
Tidy etree_assert case.
Diffstat (limited to 'ld/ldexp.c')
-rw-r--r-- | ld/ldexp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ld/ldexp.c b/ld/ldexp.c index ec25557baf..b194bec468 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; } |