2006-07-13 Denis PILAT <denis.pilat@st.com>
* interps.c (interpreter_completer): Allocate one more item to the 'matches' list and set them all to 0 with a xcalloc.
This commit is contained in:
parent
24ca47234f
commit
9af2a05463
2 changed files with 8 additions and 8 deletions
|
@ -1,3 +1,8 @@
|
|||
2006-07-13 Denis PILAT <denis.pilat@st.com>
|
||||
|
||||
* 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 <nickrob@snap.net.nz>
|
||||
|
||||
* annotate.c (annotate_frame_begin): Re-instate frame-begin
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue