diff options
| author | Tom de Vries <tdevries@suse.de> | 2018-07-04 00:07:30 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2018-07-04 11:56:51 +0200 |
| commit | 1ea5da02629b4bf9c4cea50aee189f94fa7d1a3b (patch) | |
| tree | 33ef422b27b891d67e07c3a69d51fe0274c22bfe /gdb/dwarf2read.c | |
| parent | f51e0e20bd303a9b366084ac719db10978402713 (diff) | |
| download | gdb-1ea5da02629b4bf9c4cea50aee189f94fa7d1a3b.zip gdb-1ea5da02629b4bf9c4cea50aee189f94fa7d1a3b.tar.gz gdb-1ea5da02629b4bf9c4cea50aee189f94fa7d1a3b.tar.bz2 | |
[gdb/symtab] Fix version check in dwarf compilation unit header
The version check of the dwarf compilation unit header in
error_check_comp_unit_head is done too late, and consequently dwarf code with
an unsupported version in the compilation unit header is interpreted as dwarf5
code in read_comp_unit_head.
Fixed by moving the check earlier.
Build and reg-tested on x86_64-linux.
2018-07-04 Tom de Vries <tdevries@suse.de>
* dwarf2read.c (error_check_comp_unit_head): Move dwarf version
check ...
(read_comp_unit_head): ... here.
* gdb.dwarf2/dw2-error.exp: Update expected error message.
Diffstat (limited to 'gdb/dwarf2read.c')
| -rw-r--r-- | gdb/dwarf2read.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 9f6d34f..372f45e 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -6308,6 +6308,10 @@ read_comp_unit_head (struct comp_unit_head *cu_header, cu_header->offset_size = (bytes_read == 4) ? 4 : 8; info_ptr += bytes_read; cu_header->version = read_2_bytes (abfd, info_ptr); + if (cu_header->version < 2 || cu_header->version > 5) + error (_("Dwarf Error: wrong version in compilation unit header " + "(is %d, should be 2, 3, 4 or 5) [in module %s]"), + cu_header->version, filename); info_ptr += 2; if (cu_header->version < 5) switch (section_kind) @@ -6410,11 +6414,6 @@ error_check_comp_unit_head (struct dwarf2_per_objfile *dwarf2_per_objfile, { const char *filename = get_section_file_name (section); - if (header->version < 2 || header->version > 5) - error (_("Dwarf Error: wrong version in compilation unit header " - "(is %d, should be 2, 3, 4 or 5) [in module %s]"), header->version, - filename); - if (to_underlying (header->abbrev_sect_off) >= dwarf2_section_size (dwarf2_per_objfile->objfile, abbrev_section)) error (_("Dwarf Error: bad offset (%s) in compilation unit header " |