darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* merge.c (sec_merge_emit): Tidy. Check for bfd_zmalloc errors.

Browse source 
Write trailing padding.
This commit is contained in:
Alan Modra 2005-04-14 02:27:56 +00:00
parent ab70e2a569
commit 92ceba1e4f
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bfd/ChangeLog
View file

@ -1,5 +1,8 @@
2005-04-14 Alan Modra <amodra@bigpond.net.au>
* merge.c (sec_merge_emit): Tidy. Check for bfd_zmalloc errors.
Write trailing padding.
* merge.c (merge_strings): Round up section size for alignment.
2005-04-14 David S. Miller <davem@davemloft.net>

37
bfd/merge.c
View file

@ -288,24 +288,27 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
{
struct sec_merge_sec_info *secinfo = entry->secinfo;
asection *sec = secinfo->sec;
char *pad = "";
char *pad = NULL;
bfd_size_type off = 0;
int alignment_power = sec->output_section->alignment_power;
if (alignment_power)
pad = bfd_zmalloc ((bfd_size_type) 1 << alignment_power);
{
pad = bfd_zmalloc ((bfd_size_type) 1 << alignment_power);
if (pad == NULL)
return FALSE;
}
for (; entry != NULL && entry->secinfo == secinfo; entry = entry->next)
{
register const char *str;
register size_t len;
const char *str;
bfd_size_type len;
len = off & (entry->alignment - 1);
if (len)
len = -off & (entry->alignment - 1);
if (len != 0)
{
len = entry->alignment - len;
if (bfd_bwrite (pad, len, abfd) != len)
break;
goto err;
off += len;
}
@ -313,15 +316,25 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
len = entry->len;
if (bfd_bwrite (str, len, abfd) != len)
break;
goto err;
off += len;
}
if (alignment_power)
free (pad);
/* Trailing alignment needed? */
off = sec->size - off;
if (off != 0
&& bfd_bwrite (pad, off, abfd) != off)
goto err;
return entry == NULL || entry->secinfo != secinfo;
if (pad != NULL)
free (pad);
return TRUE;
err:
if (pad != NULL)
free (pad);
return FALSE;
}
/* Register a SEC_MERGE section as a candidate for merging.