espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 07:08:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

2008-02-22 H.J. Lu <hongjiu.lu@intel.com>

Browse Source 
PR ld/5788
	* elflink.c (elf_create_symbuf): Correct buffer size and
	position.
This commit is contained in:
H.J. Lu
2008-02-23 00:02:05 +00:00
parent 6456897f67
commit 3ae181ee89
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2008-02-22 H.J. Lu <hongjiu.lu@intel.com>
PR ld/5788
* elflink.c (elf_create_symbuf): Correct buffer size and
position.
2008-02-22 Nick Clifton <nickc@redhat.com> 2008-02-22 Nick Clifton <nickc@redhat.com>
PR 868 PR 868

13
bfd/elflink.c
View File

@ -6870,7 +6870,7 @@ elf_create_symbuf (bfd_size_type symcount, Elf_Internal_Sym *isymbuf)
Elf_Internal_Sym **ind, **indbufend, **indbuf; Elf_Internal_Sym **ind, **indbufend, **indbuf;
struct elf_symbuf_symbol *ssym; struct elf_symbuf_symbol *ssym;
struct elf_symbuf_head *ssymbuf, *ssymhead; struct elf_symbuf_head *ssymbuf, *ssymhead;
bfd_size_type i, shndx_count; bfd_size_type i, shndx_count, total_size;
indbuf = bfd_malloc2 (symcount, sizeof (*indbuf)); indbuf = bfd_malloc2 (symcount, sizeof (*indbuf));
if (indbuf == NULL) if (indbuf == NULL)
@ -6890,15 +6890,16 @@ elf_create_symbuf (bfd_size_type symcount, Elf_Internal_Sym *isymbuf)
if (ind[0]->st_shndx != ind[1]->st_shndx) if (ind[0]->st_shndx != ind[1]->st_shndx)
shndx_count++; shndx_count++;
ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf) total_size = ((shndx_count + 1) * sizeof (*ssymbuf)
+ (indbufend - indbuf) * sizeof (*ssymbuf)); + (indbufend - indbuf) * sizeof (*ssym));
ssymbuf = bfd_malloc (total_size);
if (ssymbuf == NULL) if (ssymbuf == NULL)
{ {
free (indbuf); free (indbuf);
return NULL; return NULL;
} }
ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count); ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
ssymbuf->ssym = NULL; ssymbuf->ssym = NULL;
ssymbuf->count = shndx_count; ssymbuf->count = shndx_count;
ssymbuf->st_shndx = 0; ssymbuf->st_shndx = 0;
@ -6916,7 +6917,9 @@ elf_create_symbuf (bfd_size_type symcount, Elf_Internal_Sym *isymbuf)
ssym->st_other = (*ind)->st_other; ssym->st_other = (*ind)->st_other;
ssymhead->count++; ssymhead->count++;
} }
BFD_ASSERT ((bfd_size_type) (ssymhead - ssymbuf) == shndx_count); BFD_ASSERT ((bfd_size_type) (ssymhead - ssymbuf) == shndx_count
&& (((bfd_hostptr_t) ssym - (bfd_hostptr_t) ssymbuf)
== total_size));
free (indbuf); free (indbuf);
return ssymbuf; return ssymbuf;