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

* elf.c (bfd_elf_get_str_section): Allocate an extra byte after

Browse Source 
the end of strtab and clear it.
	(elf_read): Remove.
This commit is contained in:
Jakub Jelinek
2005-07-05 09:38:45 +00:00
parent dcd4b381c7
commit c6c60d09fd
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-05 Jakub Jelinek <jakub@redhat.com>
* elf.c (bfd_elf_get_str_section): Allocate an extra byte after
the end of strtab and clear it.
(elf_read): Remove.
2005-07-05 Nick Clifton <nickc@redhat.com> 2005-07-05 Nick Clifton <nickc@redhat.com>
* po/vi.po: New Vietnamese translation. * po/vi.po: New Vietnamese translation.

38
bfd/elf.c
View File

@ -206,28 +206,6 @@ bfd_elf_hash (const char *namearg)
return h & 0xffffffff; return h & 0xffffffff;
} }
/* Read a specified number of bytes at a specified offset in an ELF
file, into a newly allocated buffer, and return a pointer to the
buffer. */
static bfd_byte *
elf_read (bfd *abfd, file_ptr offset, bfd_size_type size)
{
bfd_byte *buf;
if ((buf = bfd_alloc (abfd, size)) == NULL)
return NULL;
if (bfd_seek (abfd, offset, SEEK_SET) != 0)
return NULL;
if (bfd_bread (buf, size, abfd) != size)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_file_truncated);
return NULL;
}
return buf;
}
bfd_boolean bfd_boolean
bfd_elf_mkobject (bfd *abfd) bfd_elf_mkobject (bfd *abfd)
{ {
@ -267,7 +245,21 @@ bfd_elf_get_str_section (bfd *abfd, unsigned int shindex)
/* No cached one, attempt to read, and cache what we read. */ /* No cached one, attempt to read, and cache what we read. */
offset = i_shdrp[shindex]->sh_offset; offset = i_shdrp[shindex]->sh_offset;
shstrtabsize = i_shdrp[shindex]->sh_size; shstrtabsize = i_shdrp[shindex]->sh_size;
shstrtab = elf_read (abfd, offset, shstrtabsize);
/* Allocate and clear an extra byte at the end, to prevent crashes
in case the string table is not terminated. */
if (shstrtabsize + 1 == 0
|| (shstrtab = bfd_alloc (abfd, shstrtabsize + 1)) == NULL
|| bfd_seek (abfd, offset, SEEK_SET) != 0)
shstrtab = NULL;
else if (bfd_bread (shstrtab, shstrtabsize, abfd) != shstrtabsize)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_file_truncated);
shstrtab = NULL;
}
else
shstrtab[shstrtabsize] = '\0';
i_shdrp[shindex]->contents = shstrtab; i_shdrp[shindex]->contents = shstrtab;
} }
return (char *) shstrtab; return (char *) shstrtab;