diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2004-02-22 19:26:43 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2004-02-22 19:26:43 +0000 |
| commit | 1c013b09565decb8b89e56a14c77ecba36d4823b (patch) | |
| tree | efbbea7c2864ba0594295ca65c5eeaf9c93e3dc8 | |
| parent | ea5c371d596778f867c127872c184ef3aec55ac3 (diff) | |
| download | gdb-1c013b09565decb8b89e56a14c77ecba36d4823b.tar.gz | |
* dwarf2read.c (partial_die_full_name): Always return NULL or
malloc'd memory. Don't try to free real_parent->full_name.
| -rw-r--r-- | gdb/ChangeLog.intercu | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/gdb/ChangeLog.intercu b/gdb/ChangeLog.intercu index f8f04129b2c..2782fab9444 100644 --- a/gdb/ChangeLog.intercu +++ b/gdb/ChangeLog.intercu @@ -1,5 +1,10 @@ 2004-02-22 Daniel Jacobowitz <drow@mvista.com> + * dwarf2read.c (partial_die_full_name): Always return NULL or + malloc'd memory. Don't try to free real_parent->full_name. + +2004-02-22 Daniel Jacobowitz <drow@mvista.com> + * dwarf2read.c (struct dwarf2_cu): Add read_in_chain and per_cu. (dwarf2_cu_tree): New variable. (struct dwarf2_per_cu_data): New type. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index b2cffbaf0d9..7b36f678a30 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -1688,13 +1688,13 @@ static char * partial_die_full_name (struct partial_die_info *pdi, struct dwarf2_cu *cu) { - char *parent_name, *full_name; + char *parent_name = NULL, *full_name; struct partial_die_info *real_pdi, *real_parent; struct dwarf2_cu *spec_cu; int free_parent_name = 0; - if (pdi->full_name_set) - return pdi->full_name; + /* We shouldn't even have been called in this case. */ + gdb_assert (!pdi->full_name_set); /* Note: this code could probably be micro-optimized. We may be able to avoid redoing the hash table lookup, and we might be able @@ -1710,7 +1710,7 @@ partial_die_full_name (struct partial_die_info *pdi, CU or later in this CU. It's correct, but somewhat inefficient. */ if (real_pdi->full_name_set) - return real_pdi->full_name; + return xstrdup (real_pdi->full_name); real_parent = real_pdi->die_parent; if (real_parent == NULL) @@ -1724,12 +1724,14 @@ partial_die_full_name (struct partial_die_info *pdi, fixup_partial_die (real_parent, spec_cu); parent_name = partial_die_full_name (real_parent, spec_cu); /* Could cache the full name, too. */ - free_parent_name = 1; + if (parent_name != NULL) + free_parent_name = 1; } /* End hack zone. */ - parent_name = real_parent->full_name; + if (parent_name == NULL) + parent_name = real_parent->full_name; if (parent_name == NULL) parent_name = real_parent->name; |