github/amigaos-binutils
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-binutils.git synced 2026-09-12 15:21:44 +00:00
Code Releases Activity

(amiga_write_section_contents): Use datatype of "reloc_counts" also for

Browse Source 
"reloc_count". Better error message for a relocation against an omitted
section. Replace BFD_FAIL with "bfd_set_error/return FALSE" since linking
cannot succeed. Prevent a possible endless loop when writing relocations.
Fail link operation if not all relocations could be written.
This commit is contained in:
Gunther Nikl
2009-01-08 13:10:10 +00:00
parent 8aa59c7193
commit e431b46fb2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bfd/amigaos.c
+11 -5
View File
@@ -1684,9 +1684,9 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
asymbol *sym_p;
arelent *r;
unsigned long zero=0,disksize,pad,n[2],k,l,s;
int i,j,x,type,reloc_count=0;
long *reloc_counts,reloc_count=0;
unsigned char *values;
long *reloc_counts;
int i,j,x,type;
DPRINT(5,("Entering write_section_contents\n"));
@@ -1807,8 +1807,10 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
/* Determine which hunk to write, and index of target */
x = index_map[insection->output_section->index];
if (x<0 || x>max_hunk) {
bfd_msg ("erroneous relocation to hunk %d", x);
BFD_FAIL ();
bfd_msg ("erroneous relocation to hunk %d/%s from %s",
x, insection->output_section->name, insection->name);
bfd_set_error (bfd_error_nonrepresentable_section);
return FALSE;
}
type = determine_type(r);
@@ -1904,7 +1906,7 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
DPRINT(10,("Wrote contents, writing relocs now\n"));
while (reloc_count) {
if (reloc_count > 0) {
/* Sample every reloc type */
for (i = 0; i < NB_RELOC_TYPES; i++) {
int written = FALSE;
@@ -1969,6 +1971,10 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
bfd_release (abfd, reloc_counts);
DPRINT(5,("Leaving write_section...\n"));
if (reloc_count > 0) {
bfd_set_error (bfd_error_nonrepresentable_section);
return FALSE;
}
return TRUE;
}