diff options
| author | Alan Modra <amodra@gmail.com> | 2017-03-07 12:20:00 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2017-03-07 12:33:28 +1030 |
| commit | d933941d6c5ce5b2dcaaa869919b6f3de06b725d (patch) | |
| tree | f3d3e6736ee92271352158262f235f0d1ef26a93 | |
| parent | b1b07054c08eea65ba8d1a9f771796d686f337e5 (diff) | |
| download | fsf-binutils-gdb-d933941d6c5ce5b2dcaaa869919b6f3de06b725d.zip fsf-binutils-gdb-d933941d6c5ce5b2dcaaa869919b6f3de06b725d.tar.gz fsf-binutils-gdb-d933941d6c5ce5b2dcaaa869919b6f3de06b725d.tar.bz2 | |
Fix ld uninitialized read of script ASSERT data structure
lang_assignment_statement serves both assignments and asserts.
* ldlang.c (open_input_bfds): Check that lang_assignment_statement
is not an assert before referencing defsym.
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ldlang.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index cbe44a2..3883bcb 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-03-07 Alan Modra <amodra@gmail.com> + + * ldlang.c (open_input_bfds): Check that lang_assignment_statement + is not an assert before referencing defsym. + 2017-03-05 Alan Modra <amodra@gmail.com> * testsuite/ld-elf/eh3.d: Adjust for eh_frame alignment change. diff --git a/ld/ldlang.c b/ld/ldlang.c index 1396c5b..ff6ef39 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3374,7 +3374,8 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode) #endif break; case lang_assignment_statement_enum: - if (s->assignment_statement.exp->assign.defsym) + if (s->assignment_statement.exp->type.node_class != etree_assert + && s->assignment_statement.exp->assign.defsym) /* This is from a --defsym on the command line. */ exp_fold_tree_no_dot (s->assignment_statement.exp); break; |