From 498ff0328fed7689f7a675d8c9f0f04bed1f1522 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 21 Jan 2021 16:46:20 +1030 Subject: [PATCH] PR27218, memory access violation in dwarf2dbg.c PR 27218 * dwarf2dbg.c (dwarf2_gen_line_info): Correct setting of dwarf_level. (dwarf2_directive_filename, dwarf2_directive_loc): Likewise, and error for negative file numbers. --- gas/ChangeLog | 7 +++++++ gas/dwarf2dbg.c | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index d06a018196b..f390bf26613 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2021-01-21 Alan Modra + + PR 27218 + * dwarf2dbg.c (dwarf2_gen_line_info): Correct setting of dwarf_level. + (dwarf2_directive_filename, dwarf2_directive_loc): Likewise, and + error for negative file numbers. + 2021-01-20 Alan Modra * testsuite/gas/ppc/power4.d: Adjust for removal of section sym. diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index 069f6316643..635a31cb48f 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -550,9 +550,10 @@ dwarf2_gen_line_info (addressT ofs, struct dwarf2_line_info *loc) /* Early out for as-yet incomplete location information. */ if (loc->line == 0) return; - if (loc->filenum == 0 && DWARF2_LINE_VERSION < 5) + if (loc->filenum == 0) { - dwarf_level = 5; + if (dwarf_level < 5) + dwarf_level = 5; if (DWARF2_LINE_VERSION < 5) return; } @@ -1046,10 +1047,11 @@ dwarf2_directive_filename (void) num = get_absolute_expression (); - if ((offsetT) num < 1 && DWARF2_LINE_VERSION < 5) + if ((offsetT) num < 1) { - dwarf_level = 5; - if (DWARF2_LINE_VERSION < 5) + if (num == 0 && dwarf_level < 5) + dwarf_level = 5; + if ((offsetT) num < 0 || DWARF2_LINE_VERSION < 5) { as_bad (_("file number less than one")); ignore_rest_of_line (); @@ -1149,18 +1151,16 @@ dwarf2_directive_loc (int dummy ATTRIBUTE_UNUSED) if (filenum < 1) { - if (filenum != 0 || DWARF2_LINE_VERSION < 5) + if (filenum == 0 && dwarf_level < 5) + dwarf_level = 5; + if (filenum < 0 || DWARF2_LINE_VERSION < 5) { - dwarf_level = 5; - if (DWARF2_LINE_VERSION < 5) - { - as_bad (_("file number less than one")); - return; - } + as_bad (_("file number less than one")); + return; } } - if (filenum >= (int) files_in_use || files[filenum].filename == NULL) + if ((valueT) filenum >= files_in_use || files[filenum].filename == NULL) { as_bad (_("unassigned file number %ld"), (long) filenum); return; -- 2.30.2