From 08302ed2cb8b175e3bbd4308879154baf64e6d98 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 28 Sep 2017 09:20:59 -0700 Subject: [PATCH] (open_and_init_dwp_file): Protect against some segvs This is a "tiny patch", no assignment required. 2017-09-28 Alexander Shaposhnikov * dwarf2read.c (open_and_init_dwp_file): Protect against dwp_file having NULL cus or tus. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f109ffe8639..2120df65e9d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-09-28 Alexander Shaposhnikov (tiny patch) + + * dwarf2read.c (open_and_init_dwp_file): Protect against dwp_file + having NULL cus or tus. + 2017-09-27 Ulrich Weigand * arm-tdep.c: (convert_from_extended): Remove. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 7a59c1b4358..1b15adced61 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -11199,7 +11199,8 @@ open_and_init_dwp_file (void) dwp_file->tus = create_dwp_hash_table (dwp_file, 1); /* The DWP file version is stored in the hash table. Oh well. */ - if (dwp_file->cus->version != dwp_file->tus->version) + if (dwp_file->cus && dwp_file->tus + && dwp_file->cus->version != dwp_file->tus->version) { /* Technically speaking, we should try to limp along, but this is pretty bizarre. We use pulongest here because that's the established @@ -11209,7 +11210,13 @@ open_and_init_dwp_file (void) pulongest (dwp_file->cus->version), pulongest (dwp_file->tus->version), dwp_name.c_str ()); } - dwp_file->version = dwp_file->cus->version; + + if (dwp_file->cus) + dwp_file->version = dwp_file->cus->version; + else if (dwp_file->tus) + dwp_file->version = dwp_file->tus->version; + else + dwp_file->version = 2; if (dwp_file->version == 2) bfd_map_over_sections (dwp_file->dbfd, dwarf2_locate_v2_dwp_sections, -- 2.30.2