diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2008-12-22 13:19:30 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2008-12-22 13:19:30 +0000 |
| commit | 6f4de6c97dfed92a46f3cd2d7d841b79da58ac81 (patch) | |
| tree | b060aea3209750b7566b8e5a00106f2c40460f05 | |
| parent | 567e1b4ec8fc6ef29e662987c5314f4cdb4bf287 (diff) | |
| download | gdb-6f4de6c97dfed92a46f3cd2d7d841b79da58ac81.zip gdb-6f4de6c97dfed92a46f3cd2d7d841b79da58ac81.tar.gz gdb-6f4de6c97dfed92a46f3cd2d7d841b79da58ac81.tar.bz2 | |
gdb/
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.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/completer.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/completion.exp | 18 |
4 files changed, 31 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b067ea..2a0a8c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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. diff --git a/gdb/completer.c b/gdb/completer.c index d109140..4747a42 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -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); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index efa6234..d5ae448 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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. diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index d0d0dd6..2d94fca 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -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 |