|
 |
405ea9 |
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
|
405ea9 |
From: Kevin Buettner <kevinb@redhat.com>
|
|
|
405ea9 |
Date: Tue, 8 Dec 2020 14:07:45 -0700
|
|
|
405ea9 |
Subject: gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
|
|
|
405ea9 |
|
|
|
405ea9 |
;; Fix off-by-one error in ada_fold_name.patch (RH BZ 1905996)
|
|
|
405ea9 |
;; Upstream patch proposal: https://sourceware.org/pipermail/gdb-patches/2020-December/173935.html
|
|
|
405ea9 |
;; =fedoratest
|
|
|
405ea9 |
|
|
|
405ea9 |
Fix off-by-one error in ada_fold_name
|
|
|
405ea9 |
|
|
|
405ea9 |
I'm seeing a libstdc++ assertion failure when running GDB's "maint selftest"
|
|
|
405ea9 |
command when GDB is configured with the following CFLAGS and CXXFLAGS as
|
|
|
405ea9 |
part of the configure line:
|
|
|
405ea9 |
|
|
|
405ea9 |
CFLAGS='-D_GLIBCXX_DEBUG -g3 -O0' CXXFLAGS='-D_GLIBCXX_DEBUG -g3 -O0'
|
|
|
405ea9 |
|
|
|
405ea9 |
This is what I see when running the self tests:
|
|
|
405ea9 |
|
|
|
405ea9 |
(gdb) maint selftest
|
|
|
405ea9 |
Running selftest aarch64-analyze-prologue.
|
|
|
405ea9 |
Running selftest aarch64-process-record.
|
|
|
405ea9 |
Running selftest arm-record.
|
|
|
405ea9 |
Running selftest arm_analyze_prologue.
|
|
|
405ea9 |
Running selftest array_view.
|
|
|
405ea9 |
Running selftest child_path.
|
|
|
405ea9 |
Running selftest cli_utils.
|
|
|
405ea9 |
Running selftest command_structure_invariants.
|
|
|
405ea9 |
Running selftest copy_bitwise.
|
|
|
405ea9 |
Running selftest copy_integer_to_size.
|
|
|
405ea9 |
Running selftest cp_remove_params.
|
|
|
405ea9 |
Running selftest cp_symbol_name_matches.
|
|
|
405ea9 |
Running selftest dw2_expand_symtabs_matching.
|
|
|
405ea9 |
/usr/include/c++/11/string_view:211: constexpr const value_type& std::basic_string_view<_CharT, _Traits>::operator[](std::basic_string_view<_CharT, _Traits>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; std::basic_string_view<_CharT, _Traits>::const_reference = const char&; std::basic_string_view<_CharT, _Traits>::size_type = long unsigned int]: Assertion '__pos < this->_M_len' failed.
|
|
|
405ea9 |
Aborted (core dumped)
|
|
|
405ea9 |
|
|
|
405ea9 |
Here's a partial stack trace:
|
|
|
405ea9 |
|
|
|
405ea9 |
#0 0x00007ffff6ef6262 in raise () from /lib64/libc.so.6
|
|
|
405ea9 |
#1 0x00007ffff6edf8a4 in abort () from /lib64/libc.so.6
|
|
|
405ea9 |
#2 0x00000000004249bf in std::__replacement_assert (
|
|
|
405ea9 |
__file=0xef7480 "/usr/include/c++/11/string_view", __line=211,
|
|
|
405ea9 |
__function=0xef7328 "constexpr const value_type& std::basic_string_view<_CharT, _Traits>::operator[](std::basic_string_view<_CharT, _Traits>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; std::ba"...,
|
|
|
405ea9 |
__condition=0xef7311 "__pos < this->_M_len")
|
|
|
405ea9 |
at /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h:2624
|
|
|
405ea9 |
#3 0x0000000000451737 in std::basic_string_view<char, std::char_traits<char> >::operator[] (this=0x7fffffffc200, __pos=8)
|
|
|
405ea9 |
at /usr/include/c++/11/string_view:211
|
|
|
405ea9 |
#4 0x00000000004329f5 in ada_fold_name (name="function")
|
|
|
405ea9 |
at /ironwood1/sourceware-git/rawhide-master/bld/../../worktree-master/gdb/ada-lang.c:988
|
|
|
405ea9 |
|
|
|
405ea9 |
And, looking at frame #4...
|
|
|
405ea9 |
|
|
|
405ea9 |
(top-gdb) up 4
|
|
|
405ea9 |
at /ironwood1/sourceware-git/rawhide-master/bld/../../worktree-master/gdb/ada-lang.c:988
|
|
|
405ea9 |
988 fold_buffer[i] = tolower (name[i]);
|
|
|
405ea9 |
(top-gdb) p i
|
|
|
405ea9 |
$1 = 8
|
|
|
405ea9 |
(top-gdb) p name.size()
|
|
|
405ea9 |
$2 = 8
|
|
|
405ea9 |
|
|
|
405ea9 |
My patch adjusts the comparison to only copy name.size() characters
|
|
|
405ea9 |
from the string. I've added a separate statement for NUL character
|
|
|
405ea9 |
termination of fold_buffer[].
|
|
|
405ea9 |
|
|
|
405ea9 |
gdb/ChangeLog:
|
|
|
405ea9 |
|
|
|
405ea9 |
* ada-lang.c (ada_fold_name): Fix off-by-one error.
|
|
|
405ea9 |
|
|
|
405ea9 |
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
|
|
|
405ea9 |
--- a/gdb/ada-lang.c
|
|
|
405ea9 |
+++ b/gdb/ada-lang.c
|
|
|
405ea9 |
@@ -1006,8 +1006,9 @@ ada_fold_name (gdb::string_view name)
|
|
|
405ea9 |
{
|
|
|
405ea9 |
int i;
|
|
|
405ea9 |
|
|
|
405ea9 |
- for (i = 0; i <= len; i += 1)
|
|
|
405ea9 |
+ for (i = 0; i < len; i += 1)
|
|
|
405ea9 |
fold_buffer[i] = tolower (name[i]);
|
|
|
405ea9 |
+ fold_buffer[i] = '\0';
|
|
|
405ea9 |
}
|
|
|
405ea9 |
|
|
|
405ea9 |
return fold_buffer;
|