diff options
| author | Doug Evans <dje@google.com> | 2012-05-20 17:15:29 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2012-05-20 17:15:29 +0000 |
| commit | a3ec0bb1c41e2827147c6533295d1f88746e534e (patch) | |
| tree | dc06eec8d02c877170c98fdda4dce625c243e853 /gdb | |
| parent | 3550b23619ef1078f00b3583ae04656410f5667f (diff) | |
| download | gdb-a3ec0bb1c41e2827147c6533295d1f88746e534e.zip gdb-a3ec0bb1c41e2827147c6533295d1f88746e534e.tar.gz gdb-a3ec0bb1c41e2827147c6533295d1f88746e534e.tar.bz2 | |
* dwarf2read.c (recursively_find_pc_sect_symtab): Initialize "s"
before use. Check for symtab->includes == NULL before scanning it.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 615b835..e686fb5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-05-20 Doug Evans <dje@google.com> + + * dwarf2read.c (recursively_find_pc_sect_symtab): Initialize "s" + before use. Check for symtab->includes == NULL before scanning it. + 2012-05-18 Maciej W. Rozycki <macro@codesourcery.com> * mips-tdep.c (mips_reg3_to_reg): Optimize storage. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 9729173..6ddf236 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3003,9 +3003,12 @@ recursively_find_pc_sect_symtab (struct symtab *symtab, CORE_ADDR pc) && blockvector_contains_pc (BLOCKVECTOR (symtab), pc)) return symtab; + if (symtab->includes == NULL) + return NULL; + for (i = 0; symtab->includes[i]; ++i) { - struct symtab *s; + struct symtab *s = symtab->includes[i]; s = recursively_find_pc_sect_symtab (s, pc); if (s != NULL) |