47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
diff -rupN binutils-2.30/bfd/coffgen.c binutils-2.30-new/bfd/coffgen.c
|
|
--- binutils-2.30/bfd/coffgen.c 2018-01-13 14:31:15.000000000 +0100
|
|
+++ binutils-2.30-new/bfd/coffgen.c 2018-08-22 10:26:43.019855632 +0200
|
|
@@ -1521,7 +1521,8 @@ coff_pointerize_aux (bfd *abfd,
|
|
combined_entry_type *table_base,
|
|
combined_entry_type *symbol,
|
|
unsigned int indaux,
|
|
- combined_entry_type *auxent)
|
|
+ combined_entry_type *auxent,
|
|
+ combined_entry_type *table_end)
|
|
{
|
|
unsigned int type = symbol->u.syment.n_type;
|
|
unsigned int n_sclass = symbol->u.syment.n_sclass;
|
|
@@ -1547,7 +1548,11 @@ coff_pointerize_aux (bfd *abfd,
|
|
|
|
if ((ISFCN (type) || ISTAG (n_sclass) || n_sclass == C_BLOCK
|
|
|| n_sclass == C_FCN)
|
|
- && auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l > 0)
|
|
+ && auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l > 0
|
|
+ && auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l
|
|
+ < (long) obj_raw_syment_count (abfd)
|
|
+ && table_base + auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l
|
|
+ < table_end)
|
|
{
|
|
auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p =
|
|
table_base + auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l;
|
|
@@ -1555,7 +1560,9 @@ coff_pointerize_aux (bfd *abfd,
|
|
}
|
|
/* A negative tagndx is meaningless, but the SCO 3.2v4 cc can
|
|
generate one, so we must be careful to ignore it. */
|
|
- if (auxent->u.auxent.x_sym.x_tagndx.l > 0)
|
|
+ if ((unsigned long) auxent->u.auxent.x_sym.x_tagndx.l
|
|
+ < obj_raw_syment_count (abfd)
|
|
+ && table_base + auxent->u.auxent.x_sym.x_tagndx.l < table_end)
|
|
{
|
|
auxent->u.auxent.x_sym.x_tagndx.p =
|
|
table_base + auxent->u.auxent.x_sym.x_tagndx.l;
|
|
@@ -1864,7 +1871,7 @@ coff_get_normalized_symtab (bfd *abfd)
|
|
|
|
internal_ptr->is_sym = FALSE;
|
|
coff_pointerize_aux (abfd, internal, symbol_ptr, i,
|
|
- internal_ptr);
|
|
+ internal_ptr, internal_end);
|
|
}
|
|
}
|
|
|