OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix problems introduced with my last change.

This commit is contained in:
Alan Modra 2000-05-16 02:10:00 +00:00
parent 82b43a0907
commit db8503c490
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2000-05-16 Szabolcs Szakacsits <szaka@F-Secure.com>
* peigen.c (pe_print_idata): Undo part of 2000-05-12 change that
read idata section only from dataoff.
(pe_print_edata): Correctly check for valid eat_member.
Tue May 16 00:04:11 2000 J"orn Rennecke <amylaar@cygnus.co.uk> Tue May 16 00:04:11 2000 J"orn Rennecke <amylaar@cygnus.co.uk>
* elf32-sh.c (sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8. * elf32-sh.c (sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8.

35
bfd/peigen.c
View File

@ -1108,8 +1108,8 @@ pe_print_idata (abfd, vfile)
offset = abfd->start_address - rel_section->vma; offset = abfd->start_address - rel_section->vma;
start_address = bfd_get_32(abfd, data+offset); start_address = bfd_get_32 (abfd, data + offset);
loadable_toc_address = bfd_get_32(abfd, data+offset+4); loadable_toc_address = bfd_get_32 (abfd, data + offset + 4);
toc_address = loadable_toc_address - 32768; toc_address = loadable_toc_address - 32768;
fprintf(file, fprintf(file,
@ -1134,14 +1134,16 @@ pe_print_idata (abfd, vfile)
fprintf(file, fprintf(file,
_(" Table Stamp Chain Name Thunk\n")); _(" Table Stamp Chain Name Thunk\n"));
data = (bfd_byte *) bfd_malloc (datasize); data = (bfd_byte *) bfd_malloc (dataoff + datasize);
if (data == NULL) if (data == NULL)
return false; return false;
if (! bfd_get_section_contents (abfd, section, (PTR) data, dataoff, datasize)) /* Read the whole section. Some of the fields might be before dataoff. */
if (! bfd_get_section_contents (abfd, section, (PTR) data,
0, dataoff + datasize))
return false; return false;
adj = section->vma - extra->ImageBase + dataoff; adj = section->vma - extra->ImageBase;
for (i = 0; i < datasize; i += onaline) for (i = 0; i < datasize; i += onaline)
{ {
@ -1155,7 +1157,7 @@ pe_print_idata (abfd, vfile)
char *dll; char *dll;
/* print (i + extra->DataDirectory[1].VirtualAddress) */ /* print (i + extra->DataDirectory[1].VirtualAddress) */
fprintf (file, " %08lx\t", (unsigned long) (i + adj)); fprintf (file, " %08lx\t", (unsigned long) (i + adj + dataoff));
if (i + 20 > datasize) if (i + 20 > datasize)
{ {
@ -1163,11 +1165,11 @@ pe_print_idata (abfd, vfile)
; ;
} }
hint_addr = bfd_get_32 (abfd, data + i); hint_addr = bfd_get_32 (abfd, data + i + dataoff);
time_stamp = bfd_get_32 (abfd, data + i + 4); time_stamp = bfd_get_32 (abfd, data + i + 4 + dataoff);
forward_chain = bfd_get_32 (abfd, data + i + 8); forward_chain = bfd_get_32 (abfd, data + i + 8 + dataoff);
dll_name = bfd_get_32 (abfd, data + i + 12); dll_name = bfd_get_32 (abfd, data + i + 12 + dataoff);
first_thunk = bfd_get_32 (abfd, data + i + 16); first_thunk = bfd_get_32 (abfd, data + i + 16 + dataoff);
fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n", fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n",
(unsigned long) hint_addr, (unsigned long) hint_addr,
@ -1257,8 +1259,7 @@ pe_print_idata (abfd, vfile)
} }
else else
{ {
ordinal = bfd_get_16(abfd, ordinal = bfd_get_16 (abfd, data + iat_member - adj);
data + iat_member - adj);
member_name = (char *) data + iat_member - adj + 2; member_name = (char *) data + iat_member - adj + 2;
fprintf(file, "\t%04lx\t %4d %s\n", fprintf(file, "\t%04lx\t %4d %s\n",
(unsigned long) iat_member, (unsigned long) iat_member,
@ -1451,16 +1452,12 @@ pe_print_edata (abfd, vfile)
{ {
bfd_vma eat_member = bfd_get_32 (abfd, bfd_vma eat_member = bfd_get_32 (abfd,
data + edt.eat_addr + (i * 4) - adj); data + edt.eat_addr + (i * 4) - adj);
bfd_vma eat_actual = eat_member;
bfd_vma edata_start = bfd_get_section_vma (abfd, section);
bfd_vma edata_end = edata_start + datasize;
if (eat_member == 0) if (eat_member == 0)
continue; continue;
if (edata_start < eat_actual && eat_actual < edata_end) if (eat_member - adj <= datasize)
{ {
/* this rva is to a name (forwarding function) in our section */ /* This rva is to a name (forwarding function) in our section. */
/* Should locate a function descriptor */ /* Should locate a function descriptor */
fprintf (file, fprintf (file,
"\t[%4ld] +base[%4ld] %04lx %s -- %s\n", "\t[%4ld] +base[%4ld] %04lx %s -- %s\n",