OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* dwarf2read.c (typename_concat): Don't segv if prefix or suffix

Browse Source 
is NULL.  Simplify obs == NULL case.
This commit is contained in:
Doug Evans 2008-10-24 18:21:00 +00:00
parent fff0886884
commit 6dd47d34c6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2008-10-24 Doug Evans <dje@google.com>
* dwarf2read.c (typename_concat): Don't segv if prefix or suffix
is NULL. Simplify obs == NULL case.
2008-10-24 Hui Zhu <teawater@gmail.com>
Pedro Alves <pedro@codesourcery.com>

18
gdb/dwarf2read.c
View File

@ -8081,19 +8081,17 @@ typename_concat (struct obstack *obs, const char *prefix, const char *suffix,
else
sep = "::";
if (prefix == NULL)
prefix = "";
if (suffix == NULL)
suffix = "";
if (obs == NULL)
{
char *retval = xmalloc (strlen (prefix) + MAX_SEP_LEN + strlen (suffix) + 1);
retval[0] = '\0';
if (prefix)
{
strcpy (retval, prefix);
strcat (retval, sep);
}
if (suffix)
strcat (retval, suffix);
strcpy (retval, prefix);
strcat (retval, sep);
strcat (retval, suffix);
return retval;
}
else