Fix memory double-free.
	* completer.c (line_completion_function): Clear LIST after called xfree.
gdb/testsuite/
	* gdb.base/completion.exp (Completing non-existing component): New test.
This commit is contained in:
Jan Kratochvil 2008-12-22 13:19:30 +00:00
parent 567e1b4ec8
commit 6f4de6c97d
4 changed files with 31 additions and 2 deletions

View File

@ -1,4 +1,9 @@
2008-12-22 Joel Brobecker <brobecker@adacore.com>
2008-12-22 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix memory double-free.
* completer.c (line_completion_function): Clear LIST after called xfree.
2008-12-22 Joel Brobecker <brobecker@adacore.com>
* breakpoint.c (update_watchpoint): Adjust and extend the description
of this function. Fix one error message accordingly.

View File

@ -752,8 +752,10 @@ line_completion_function (const char *text, int matches,
if (list)
{
/* Free the storage used by LIST, but not by the strings inside.
This is because rl_complete_internal () frees the strings. */
This is because rl_complete_internal () frees the strings.
As complete_line may abort by calling `error' clear LIST now. */
xfree (list);
list = NULL;
}
index = 0;
list = complete_line (text, line_buffer, point);

View File

@ -1,3 +1,7 @@
2008-12-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/completion.exp (Completing non-existing component): New test.
2008-12-21 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix for PR gdb/8648.

View File

@ -805,6 +805,24 @@ gdb_expect {
timeout { fail "(timeout) complete 'set follow-fork-mode'" }
}
send_gdb "p values\[0\].nonex.\t"
gdb_expect {
-re "Type struct some_struct has no component named nonex.\r\n$gdb_prompt $"\
{ pass "Completing non-existing component" }
-re ".*$gdb_prompt $" { fail "Completing non-existing component" }
timeout { fail "(timeout) Completing non-existing component" }
eof { fail "(eof) Completing non-existing component #2" }
}
# Double memory freeing gets found only on the second run:
send_gdb "p values\[0\].nonex.\t"
gdb_expect {
-re "Type struct some_struct has no component named nonex.\r\n$gdb_prompt $"\
{ pass "Completing non-existing component #2" }
-re ".*$gdb_prompt $" { fail "Completing non-existing component #2" }
timeout { fail "(timeout) Completing non-existing component #2" }
eof { fail "(eof) Completing non-existing component #2" }
}
# Restore globals modified in this test...
if [info exists old_inputrc] {
set env(INPUTRC) $old_inputrc