From 9af2a05463af610d6e166ba4e2831f8fbca7cfb0 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Thu, 13 Jul 2006 09:03:38 +0000 Subject: 2006-07-13 Denis PILAT * interps.c (interpreter_completer): Allocate one more item to the 'matches' list and set them all to 0 with a xcalloc. --- gdb/ChangeLog | 5 +++++ gdb/interps.c | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c954e95..5424058 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2006-07-13 Denis PILAT + + * interps.c (interpreter_completer): Allocate one more item to the + 'matches' list and set them all to 0 with a xcalloc. + 2006-07-13 Nick Roberts * annotate.c (annotate_frame_begin): Re-instate frame-begin diff --git a/gdb/interps.c b/gdb/interps.c index a1b0492..f72f683 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -424,10 +424,11 @@ interpreter_completer (char *text, char *word) struct interp *interp; /* We expect only a very limited number of interpreters, so just - allocate room for all of them. */ + allocate room for all of them plus one for the last that must be NULL + to correctly end the list. */ for (interp = interp_list; interp != NULL; interp = interp->next) ++alloced; - matches = (char **) xmalloc (alloced * sizeof (char *)); + matches = (char **) xcalloc (alloced + 1, sizeof (char *)); num_matches = 0; textlen = strlen (text); @@ -460,12 +461,6 @@ interpreter_completer (char *text, char *word) xfree (matches); matches = NULL; } - else if (num_matches < alloced) - { - matches = (char **) xrealloc ((char *) matches, ((num_matches + 1) - * sizeof (char *))); - matches[num_matches] = NULL; - } return matches; } -- cgit v1.1