]>
Commit | Line | Data |
---|---|---|
0c98d65a MT |
1 | *** ../binutils-2.20.51.0.10.orig/bfd/merge.c 2010-08-20 12:19:33.000000000 +0100 |
2 | --- bfd/merge.c 2010-08-20 12:18:01.000000000 +0100 | |
3 | *************** sec_merge_emit (bfd *abfd, struct sec_me | |
4 | *** 307,312 **** | |
5 | --- 307,315 ---- | |
6 | len = -off & (entry->alignment - 1); | |
7 | if (len != 0) | |
8 | { | |
9 | + /* We should never have an entry with an alignment | |
10 | + greater than the section's alignment. */ | |
11 | + BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power)); | |
12 | if (bfd_bwrite (pad, len, abfd) != len) | |
13 | goto err; | |
14 | off += len; | |
15 | *************** sec_merge_emit (bfd *abfd, struct sec_me | |
16 | *** 324,329 **** | |
17 | --- 327,333 ---- | |
18 | /* Trailing alignment needed? */ | |
19 | off = sec->size - off; | |
20 | if (off != 0 | |
21 | + && alignment_power | |
22 | && bfd_bwrite (pad, off, abfd) != off) | |
23 | goto err; | |
24 |