aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2023-03-06 10:43:47 +1030
committerAlan Modra <amodra@gmail.com>2023-03-06 13:11:22 +1030
commitd845ea8cd3daf11ddef16501f322875874295027 (patch)
treeba804ee374e9c0235ad10cf6f72aa28780de1a03 /bfd
parentd919194f08518c8bb9904f76c1077c4ac2037475 (diff)
downloadgdb-d845ea8cd3daf11ddef16501f322875874295027.zip
gdb-d845ea8cd3daf11ddef16501f322875874295027.tar.gz
gdb-d845ea8cd3daf11ddef16501f322875874295027.tar.bz2
More _bfd_ecoff_locate_line sanity checks
* ecofflink.c (mk_fdrtab): Discard fdr with negative cpd. (lookup_line): Sanity check fdr cbLineOffset and cbLine. Sanity check pdr cbLineOffset.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ecofflink.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c
index 00f1e3d..bba2592 100644
--- a/bfd/ecofflink.c
+++ b/bfd/ecofflink.c
@@ -1742,6 +1742,7 @@ mk_fdrtab (bfd *abfd,
/* Sanity check fdr procedure descriptor pointer. */
long ipdMax = debug_info->symbolic_header.ipdMax;
if (fdr_ptr->ipdFirst >= ipdMax
+ || fdr_ptr->cpd < 0
|| fdr_ptr->cpd > ipdMax - fdr_ptr->ipdFirst)
fdr_ptr->cpd = 0;
/* Skip FDRs that have no PDRs. */
@@ -2146,12 +2147,20 @@ lookup_line (bfd *abfd,
are stored in a very funky format, which I won't try to
describe. The search is bounded by the end of the FDRs line
number entries. */
- line_end = debug_info->line + fdr_ptr->cbLineOffset + fdr_ptr->cbLine;
+ line_ptr = line_end = debug_info->line;
+ if (fdr_ptr->cbLineOffset < debug_info->symbolic_header.cbLine
+ && fdr_ptr->cbLine <= (debug_info->symbolic_header.cbLine
+ - fdr_ptr->cbLineOffset)
+ && pdr.cbLineOffset <= (debug_info->symbolic_header.cbLine
+ - fdr_ptr->cbLineOffset))
+ {
+ line_end += fdr_ptr->cbLineOffset + fdr_ptr->cbLine;
+ line_ptr += fdr_ptr->cbLineOffset + pdr.cbLineOffset;
+ }
/* Make offset relative to procedure entry. */
offset -= pdr.adr - 0x10 * pdr.prof;
lineno = pdr.lnLow;
- line_ptr = debug_info->line + fdr_ptr->cbLineOffset + pdr.cbLineOffset;
while (line_ptr < line_end)
{
int delta;