* completer.c (add_struct_fields): Check type_name against NULL

before use.
This commit is contained in:
Tom Tromey 2009-02-03 19:20:02 +00:00
parent 692263b89b
commit b32d97f3d2
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2009-02-03 Tom Tromey <tromey@redhat.com>
* completer.c (add_struct_fields): Check type_name against NULL
before use.
2009-02-03 Joel Brobecker <brobecker@adacore.com>
* MAINTAINERS: Update Elena's email address.

View File

@ -371,6 +371,7 @@ add_struct_fields (struct type *type, int *nextp, char **output,
char *fieldname, int namelen)
{
int i;
int computed_type_name = 0;
char *type_name = NULL;
CHECK_TYPEDEF (type);
@ -392,10 +393,13 @@ add_struct_fields (struct type *type, int *nextp, char **output,
char *name = TYPE_FN_FIELDLIST_NAME (type, i);
if (name && ! strncmp (name, fieldname, namelen))
{
if (!type_name)
type_name = type_name_no_tag (type);
if (!computed_type_name)
{
type_name = type_name_no_tag (type);
computed_type_name = 1;
}
/* Omit constructors from the completion list. */
if (strcmp (type_name, name))
if (type_name && strcmp (type_name, name))
{
output[*nextp] = xstrdup (name);
++*nextp;