From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 4 Feb 2018 20:55:04 +0100 Subject: gdb-rhbz1540559-gdbaddindex-glibcdebug-regression.patch FileName: gdb-rhbz1540559-gdbaddindex-glibcdebug-regression.patch ;; Fix -D_GLIBCXX_DEBUG gdb-add-index regression (RH BZ 1540559). gdb: Out-of-bounds vector access while running gdb-add-index https://bugzilla.redhat.com/show_bug.cgi?id=1540559 Fedora Rawhide started to use -D_GLIBCXX_DEBUG which made gdb-add-index failing. /usr/include/c++/7/debug/safe_iterator.h:270: Error: attempt to dereference a past-the-end iterator. Objects involved in the operation: iterator "this" @ 0x0x7fffffffcb90 { type = __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > > >, std::__debug::vector > > > (mutable iterator); state = past-the-end; references sequence with type 'std::__debug::vector > >' @ 0x0x7fffffffcc50 } /usr/include/c++/7/debug/vector:417: Error: attempt to subscript container with out-of-bounds index 556, but container only holds 556 elements. Objects involved in the operation: sequence "this" @ 0x0x2e87af8 { type = std::__debug::vector >; } I do not know if anyone regression-tests GDB with -D_GLIBCXX_DEBUG, I have just checked -D_GLIBCXX_DEBUG run against gdb-add-index. The two -D_GLIBCXX_DEBUG regressions were made by: commit bc8f2430e08cc2a520db49a42686e0529be4a3bc Author: Jan Kratochvil Date: Mon Jun 12 16:29:53 2017 +0100 Code cleanup: C++ify .gdb_index producer commit af5bf4ada48ff65b6658be1fab8f9c8f8ab5f319 Author: Simon Marchi Date: Sat Oct 14 08:06:29 2017 -0400 Replace psymbol_allocation_list with std::vector gdb/ChangeLog 2018-02-04 Jan Kratochvil * dwarf2read.c (data_buf::grow) (write_one_signatured_type) (recursively_write_psymbols) (debug_names::recursively_write_psymbols) (debug_names::write_one_signatured_type): Fix -D_GLIBCXX_DEBUG regression. --- gdb/dwarf2read.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 64329af71e..3c9b9dc188 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -25696,7 +25696,7 @@ private: gdb_byte *grow (size_t size) { m_vec.resize (m_vec.size () + size); - return &*m_vec.end () - size; + return &*(m_vec.end () - size); } gdb::byte_vector m_vec; @@ -26130,12 +26130,14 @@ write_one_signatured_type (void **slot, void *d) write_psymbols (info->symtab, info->psyms_seen, - &info->objfile->global_psymbols[psymtab->globals_offset], + (info->objfile->global_psymbols.data() + + psymtab->globals_offset), psymtab->n_global_syms, info->cu_index, 0); write_psymbols (info->symtab, info->psyms_seen, - &info->objfile->static_psymbols[psymtab->statics_offset], + (info->objfile->static_psymbols.data() + + psymtab->statics_offset), psymtab->n_static_syms, info->cu_index, 1); @@ -26185,12 +26187,12 @@ recursively_write_psymbols (struct objfile *objfile, write_psymbols (symtab, psyms_seen, - &objfile->global_psymbols[psymtab->globals_offset], + objfile->global_psymbols.data() + psymtab->globals_offset, psymtab->n_global_syms, cu_index, 0); write_psymbols (symtab, psyms_seen, - &objfile->static_psymbols[psymtab->statics_offset], + objfile->static_psymbols.data() + psymtab->statics_offset, psymtab->n_static_syms, cu_index, 1); } @@ -26379,10 +26381,10 @@ public: psyms_seen, cu_index); write_psymbols (psyms_seen, - &objfile->global_psymbols[psymtab->globals_offset], + objfile->global_psymbols.data() + psymtab->globals_offset, psymtab->n_global_syms, cu_index, false, unit_kind::cu); write_psymbols (psyms_seen, - &objfile->static_psymbols[psymtab->statics_offset], + objfile->static_psymbols.data() + psymtab->statics_offset, psymtab->n_static_syms, cu_index, true, unit_kind::cu); } @@ -26738,11 +26740,13 @@ private: struct partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->psyms_seen, - &info->objfile->global_psymbols[psymtab->globals_offset], + (info->objfile->global_psymbols.data() + + psymtab->globals_offset), psymtab->n_global_syms, info->cu_index, false, unit_kind::tu); write_psymbols (info->psyms_seen, - &info->objfile->static_psymbols[psymtab->statics_offset], + (info->objfile->static_psymbols.data() + + psymtab->statics_offset), psymtab->n_static_syms, info->cu_index, true, unit_kind::tu); -- 2.14.3