aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@google.com>2011-10-19 15:26:30 +0000
committerCary Coutant <ccoutant@google.com>2011-10-19 15:26:30 +0000
commit6caca83cb89f391d936c4a2a6cefea8cc1e167c8 (patch)
tree21c897a9d4c00cc62ef7387e823d542b436ae8e2 /gdb
parentea0d8c4740b09bb4d919a3e6b53d7a141f76a2bd (diff)
downloadgdb-6caca83cb89f391d936c4a2a6cefea8cc1e167c8.zip
gdb-6caca83cb89f391d936c4a2a6cefea8cc1e167c8.tar.gz
gdb-6caca83cb89f391d936c4a2a6cefea8cc1e167c8.tar.bz2
* dwarf2read.c (peek_abbrev_code): New function.
(dw2_get_file_names): Check for dummy compilation units. (create_debug_types_hash_table): Likewise. (process_psymtab_comp_unit): Likewise. (load_partial_comp_unit): Likewise. (load_full_comp_unit): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/dwarf2read.c56
2 files changed, 65 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c8b7d4..0405847 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-19 Cary Coutant <ccoutant@google.com>
+
+ * dwarf2read.c (peek_abbrev_code): New function.
+ (dw2_get_file_names): Check for dummy compilation units.
+ (create_debug_types_hash_table): Likewise.
+ (process_psymtab_comp_unit): Likewise.
+ (load_partial_comp_unit): Likewise.
+ (load_full_comp_unit): Likewise.
+
2011-10-18 Aleksandar Ristovski <aristovski@qnx.com>
* solib-svr4.c (read_program_header): New variables pt_phdr, pt_phdr_p,
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 5a6a516..a99a690 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -936,6 +936,8 @@ static void dwarf2_read_abbrevs (bfd *abfd, struct dwarf2_cu *cu);
static void dwarf2_free_abbrev_table (void *);
+static unsigned int peek_abbrev_code (bfd *, gdb_byte *);
+
static struct abbrev_info *peek_die_abbrev (gdb_byte *, unsigned int *,
struct dwarf2_cu *);
@@ -2307,6 +2309,14 @@ dw2_get_file_names (struct objfile *objfile,
buffer, buffer_size,
abfd);
+ /* Skip dummy compilation units. */
+ if (info_ptr >= buffer + buffer_size
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ {
+ do_cleanups (cleanups);
+ return NULL;
+ }
+
this_cu->cu = &cu;
cu.per_cu = this_cu;
@@ -3204,6 +3214,14 @@ create_debug_types_hash_table (struct objfile *objfile)
signature = bfd_get_64 (objfile->obfd, ptr);
ptr += 8;
type_offset = read_offset_1 (objfile->obfd, ptr, offset_size);
+ ptr += 1;
+
+ /* Skip dummy type units. */
+ if (ptr >= end_ptr || peek_abbrev_code (objfile->obfd, ptr) == 0)
+ {
+ info_ptr = info_ptr + initial_length_size + length;
+ continue;
+ }
type_sig = obstack_alloc (&objfile->objfile_obstack, sizeof (*type_sig));
memset (type_sig, 0, sizeof (*type_sig));
@@ -3356,6 +3374,16 @@ process_psymtab_comp_unit (struct objfile *objfile,
buffer, buffer_size,
abfd);
+ /* Skip dummy compilation units. */
+ if (info_ptr >= buffer + buffer_size
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ {
+ info_ptr = (beg_of_comp_unit + cu.header.length
+ + cu.header.initial_length_size);
+ do_cleanups (back_to_inner);
+ return info_ptr;
+ }
+
cu.list_in_scope = &file_symbols;
/* If this compilation unit was already read in, free the
@@ -3644,6 +3672,15 @@ load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu,
dwarf2_per_objfile->info.size,
abfd);
+ /* Skip dummy compilation units. */
+ if (info_ptr >= (dwarf2_per_objfile->info.buffer
+ + dwarf2_per_objfile->info.size)
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ {
+ do_cleanups (free_cu_cleanup);
+ return;
+ }
+
/* Link this compilation unit into the compilation unit tree. */
this_cu->cu = cu;
cu->per_cu = this_cu;
@@ -4256,6 +4293,16 @@ add_partial_enumeration (struct partial_die_info *enum_pdi,
}
}
+/* Return the initial uleb128 in the die at INFO_PTR. */
+
+static unsigned int
+peek_abbrev_code (bfd *abfd, gdb_byte *info_ptr)
+{
+ unsigned int bytes_read;
+
+ return read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+}
+
/* Read the initial uleb128 in the die at INFO_PTR in compilation unit CU.
Return the corresponding abbrev, or NULL if the number is zero (indicating
an empty DIE). In either case *BYTES_READ will be set to the length of
@@ -4640,6 +4687,15 @@ load_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
/* Read in the comp_unit header. */
info_ptr = read_comp_unit_head (&cu->header, info_ptr, abfd);
+ /* Skip dummy compilation units. */
+ if (info_ptr >= (dwarf2_per_objfile->info.buffer
+ + dwarf2_per_objfile->info.size)
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ {
+ do_cleanups (free_cu_cleanup);
+ return;
+ }
+
/* Complete the cu_header. */
cu->header.offset = offset;
cu->header.first_die_offset = info_ptr - beg_of_comp_unit;