aboutsummaryrefslogtreecommitdiff
path: root/gdb/completer.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2019-06-13 00:06:52 +0100
committerPedro Alves <palves@redhat.com>2019-06-13 00:07:37 +0100
commit3844e605e61777555aed09ab8ce88db2da95bc0b (patch)
tree6efaa3b3e032c0672cdd9d07bf8b0fc122415e1f /gdb/completer.c
parent00b56dbe7016bc33f882525a47faab943fdeda9a (diff)
downloadgdb-3844e605e61777555aed09ab8ce88db2da95bc0b.zip
gdb-3844e605e61777555aed09ab8ce88db2da95bc0b.tar.gz
gdb-3844e605e61777555aed09ab8ce88db2da95bc0b.tar.bz2
Fix latent bug with custom word point completers
Completion routines that use a custom word point, and that then recurse into complete_line (e.g., if we make "thread apply" a custom word point completer, and complete on the command passed as argument), we stumble on this latent bug: (gdb) thread apply all pri[TAB] (gdb) thread apply all priprint The problem is that there's a spot in complete_line_internal_1 that rewinds the completion word but does not reflect that change in the custom word point in the tracker. This patch fixes it. gdb/ChangeLog: 2019-06-13 Pedro Alves <palves@redhat.com> * completer.c (complete_line_internal_1): Rewind completion word point. (completion_tracker::advance_custom_word_point_by): Change parameter type to int. * completer.h (completion_tracker::advance_custom_word_point_by): Likewise.
Diffstat (limited to 'gdb/completer.c')
-rw-r--r--gdb/completer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gdb/completer.c b/gdb/completer.c
index 03d0d0e..5dd9a99 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -1403,6 +1403,9 @@ complete_line_internal_1 (completion_tracker &tracker,
break;
}
+ /* Move the custom word point back too. */
+ tracker.advance_custom_word_point_by (q - p);
+
if (reason != handle_brkchars)
complete_on_cmdlist (result_list, tracker, q, word,
ignore_help_classes);
@@ -1972,7 +1975,7 @@ completion_tracker::recompute_lowest_common_denominator
/* See completer.h. */
void
-completion_tracker::advance_custom_word_point_by (size_t len)
+completion_tracker::advance_custom_word_point_by (int len)
{
m_custom_word_point += len;
}