]>
Commit | Line | Data |
---|---|---|
59e455fe ER |
1 | --- a/bfd/merge.c 2010-08-20 12:19:33.000000000 +0100 |
2 | +++ b/bfd/merge.c 2010-08-20 12:18:01.000000000 +0100 | |
3 | @@ -307,6 +307,9 @@ | |
4 | len = -off & (entry->alignment - 1); | |
5 | if (len != 0) | |
6 | { | |
7 | + /* We should never have an entry with an alignment | |
8 | + greater than the section's alignment. */ | |
9 | + BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power)); | |
10 | if (bfd_bwrite (pad, len, abfd) != len) | |
11 | goto err; | |
12 | off += len; | |
13 | @@ -324,6 +327,7 @@ | |
14 | /* Trailing alignment needed? */ | |
15 | off = sec->size - off; | |
16 | if (off != 0 | |
17 | + && alignment_power | |
18 | && bfd_bwrite (pad, off, abfd) != off) | |
19 | goto err; | |
20 |