espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-10 05:52:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

* peXXigen.c: Whitespace.

Browse Source 
(pe_print_idata): Correct section limit calculations.  Tidy array
	indexing.
	(_bfd_XX_print_ce_compressed_pdata): Don't leak memory.
This commit is contained in:
Alan Modra
2010-09-06 23:55:10 +00:00
parent 809df4465f
commit 4e1fc5994d
2 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2010-09-07 Alan Modra <amodra@gmail.com>
Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
* peXXigen.c: Whitespace.
(pe_print_idata): Correct section limit calculations. Tidy array
indexing.
(_bfd_XX_print_ce_compressed_pdata): Don't leak memory.
2010-09-02 Richard Henderson <rth@redhat.com> 2010-09-02 Richard Henderson <rth@redhat.com>
* config.bfd (x86_64-*-mingw*): Select 32-bit pei vectors too. * config.bfd (x86_64-*-mingw*): Select 32-bit pei vectors too.

72
bfd/peXXigen.c
View File

@ -1110,7 +1110,6 @@ pe_print_idata (bfd * abfd, void * vfile)
section->name, (unsigned long) addr); section->name, (unsigned long) addr);
dataoff = addr - section->vma; dataoff = addr - section->vma;
datasize -= dataoff;
#ifdef POWERPC_LE_PE #ifdef POWERPC_LE_PE
if (rel_section != 0 && rel_section->size != 0) if (rel_section != 0 && rel_section->size != 0)
@ -1183,7 +1182,7 @@ pe_print_idata (bfd * abfd, void * vfile)
adj = section->vma - extra->ImageBase; adj = section->vma - extra->ImageBase;
/* Print all image import descriptors. */ /* Print all image import descriptors. */
for (i = 0; i < datasize; i += onaline) for (i = dataoff; i + onaline <= datasize; i += onaline)
{ {
bfd_vma hint_addr; bfd_vma hint_addr;
bfd_vma time_stamp; bfd_vma time_stamp;
@ -1195,12 +1194,12 @@ pe_print_idata (bfd * abfd, void * vfile)
char *dll; char *dll;
/* Print (i + extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress). */ /* Print (i + extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress). */
fprintf (file, " %08lx\t", (unsigned long) (i + adj + dataoff)); fprintf (file, " %08lx\t", (unsigned long) (i + adj));
hint_addr = bfd_get_32 (abfd, data + i + dataoff); hint_addr = bfd_get_32 (abfd, data + i);
time_stamp = bfd_get_32 (abfd, data + i + 4 + dataoff); time_stamp = bfd_get_32 (abfd, data + i + 4);
forward_chain = bfd_get_32 (abfd, data + i + 8 + dataoff); forward_chain = bfd_get_32 (abfd, data + i + 8);
dll_name = bfd_get_32 (abfd, data + i + 12 + dataoff); dll_name = bfd_get_32 (abfd, data + i + 12);
first_thunk = bfd_get_32 (abfd, data + i + 16 + dataoff); first_thunk = bfd_get_32 (abfd, data + i + 16);
fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n", fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n",
(unsigned long) hint_addr, (unsigned long) hint_addr,
@ -1225,15 +1224,16 @@ pe_print_idata (bfd * abfd, void * vfile)
bfd_vma ft_addr; bfd_vma ft_addr;
bfd_size_type ft_datasize; bfd_size_type ft_datasize;
int ft_idx; int ft_idx;
int ft_allocated = 0; int ft_allocated;
fprintf (file, _("\tvma: Hint/Ord Member-Name Bound-To\n")); fprintf (file, _("\tvma: Hint/Ord Member-Name Bound-To\n"));
idx = hint_addr - adj; idx = hint_addr - adj;
ft_addr = first_thunk + extra->ImageBase; ft_addr = first_thunk + extra->ImageBase;
ft_data = data;
ft_idx = first_thunk - adj; ft_idx = first_thunk - adj;
ft_data = data + ft_idx;
ft_datasize = datasize - ft_idx;
ft_allocated = 0; ft_allocated = 0;
if (first_thunk != hint_addr) if (first_thunk != hint_addr)
@ -1243,9 +1243,8 @@ pe_print_idata (bfd * abfd, void * vfile)
ft_section != NULL; ft_section != NULL;
ft_section = ft_section->next) ft_section = ft_section->next)
{ {
ft_datasize = ft_section->size;
if (ft_addr >= ft_section->vma if (ft_addr >= ft_section->vma
&& ft_addr < ft_section->vma + ft_datasize) && ft_addr < ft_section->vma + ft_section->size)
break; break;
} }
@ -1258,34 +1257,28 @@ pe_print_idata (bfd * abfd, void * vfile)
/* Now check to see if this section is the same as our current /* Now check to see if this section is the same as our current
section. If it is not then we will have to load its data in. */ section. If it is not then we will have to load its data in. */
if (ft_section == section) if (ft_section != section)
{
ft_data = data;
ft_idx = first_thunk - adj;
}
else
{ {
ft_idx = first_thunk - (ft_section->vma - extra->ImageBase); ft_idx = first_thunk - (ft_section->vma - extra->ImageBase);
ft_data = (bfd_byte *) bfd_malloc (datasize); ft_datasize = ft_section->size - ft_idx;
ft_data = (bfd_byte *) bfd_malloc (ft_datasize);
if (ft_data == NULL) if (ft_data == NULL)
continue; continue;
/* Read datasize bfd_bytes starting at offset ft_idx. */ /* Read ft_datasize bytes starting at offset ft_idx. */
if (! bfd_get_section_contents if (!bfd_get_section_contents (abfd, ft_section, ft_data,
(abfd, ft_section, ft_data, (bfd_vma) ft_idx, datasize)) (bfd_vma) ft_idx, ft_datasize))
{ {
free (ft_data); free (ft_data);
continue; continue;
} }
ft_idx = 0;
ft_allocated = 1; ft_allocated = 1;
} }
} }
/* Print HintName vector entries. */ /* Print HintName vector entries. */
#ifdef COFF_WITH_pex64 #ifdef COFF_WITH_pex64
for (j = 0; j < datasize; j += 8) for (j = 0; idx + j + 8 <= datasize; j += 8)
{ {
unsigned long member = bfd_get_32 (abfd, data + idx + j); unsigned long member = bfd_get_32 (abfd, data + idx + j);
unsigned long member_high = bfd_get_32 (abfd, data + idx + j + 4); unsigned long member_high = bfd_get_32 (abfd, data + idx + j + 4);
@ -1310,13 +1303,14 @@ pe_print_idata (bfd * abfd, void * vfile)
table holds actual addresses. */ table holds actual addresses. */
if (time_stamp != 0 if (time_stamp != 0
&& first_thunk != 0 && first_thunk != 0
&& first_thunk != hint_addr) && first_thunk != hint_addr
&& j + 4 <= ft_datasize)
fprintf (file, "\t%04lx", fprintf (file, "\t%04lx",
(unsigned long) bfd_get_32 (abfd, ft_data + ft_idx + j)); (unsigned long) bfd_get_32 (abfd, ft_data + j));
fprintf (file, "\n"); fprintf (file, "\n");
} }
#else #else
for (j = 0; j < datasize; j += 4) for (j = 0; idx + j + 4 <= datasize; j += 4)
{ {
unsigned long member = bfd_get_32 (abfd, data + idx + j); unsigned long member = bfd_get_32 (abfd, data + idx + j);
@ -1342,9 +1336,10 @@ pe_print_idata (bfd * abfd, void * vfile)
table holds actual addresses. */ table holds actual addresses. */
if (time_stamp != 0 if (time_stamp != 0
&& first_thunk != 0 && first_thunk != 0
&& first_thunk != hint_addr) && first_thunk != hint_addr
&& j + 4 <= ft_datasize)
fprintf (file, "\t%04lx", fprintf (file, "\t%04lx",
(unsigned long) bfd_get_32 (abfd, ft_data + ft_idx + j)); (unsigned long) bfd_get_32 (abfd, ft_data + j));
fprintf (file, "\n"); fprintf (file, "\n");
} }
@ -1828,7 +1823,6 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
bfd_vma other_data; bfd_vma other_data;
bfd_vma prolog_length, function_length; bfd_vma prolog_length, function_length;
int flag32bit, exception_flag; int flag32bit, exception_flag;
bfd_byte *tdata = 0;
asection *tsection; asection *tsection;
if (i + PDATA_ROW_SIZE > stop) if (i + PDATA_ROW_SIZE > stop)
@ -1860,12 +1854,13 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
if (tsection && coff_section_data (abfd, tsection) if (tsection && coff_section_data (abfd, tsection)
&& pei_section_data (abfd, tsection)) && pei_section_data (abfd, tsection))
{ {
if (bfd_malloc_and_get_section (abfd, tsection, & tdata)) bfd_vma eh_off = (begin_addr - 8) - tsection->vma;
{ bfd_byte *tdata;
int xx = (begin_addr - 8) - tsection->vma;
tdata = (bfd_byte *) bfd_malloc (8); tdata = (bfd_byte *) bfd_malloc (8);
if (bfd_get_section_contents (abfd, tsection, tdata, (bfd_vma) xx, 8)) if (tdata)
{
if (bfd_get_section_contents (abfd, tsection, tdata, eh_off, 8))
{ {
bfd_vma eh, eh_data; bfd_vma eh, eh_data;
@ -1883,11 +1878,6 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
} }
free (tdata); free (tdata);
} }
else
{
if (tdata)
free (tdata);
}
} }
fprintf (file, "\n"); fprintf (file, "\n");