Attachment 299049 Details for Bug 438263 – Roland's patch

Roland's patch

dwfl_module_getdwarf.patch (text/x-patch), 1.66 KB, created by Stan Cox on 2008-03-25 16:33:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stan Cox

Created: 2008-03-25 16:33:31 UTC

Size: 1.66 KB

patch

obsolete

># old_revision [1ce47a25983124ed2e600572ce9a9654f025731a]
>#
># patch "libdwfl/dwfl_module_getdwarf.c"
>#  from [09ddf235ddc578bf08e3571146bd0d411415a1ac]
>#    to [4b53d1c4e185e5f39613ca0beb56ebe8a26e73e0]
>#
>============================================================
>--- libdwfl/dwfl_module_getdwarf.c      09ddf235ddc578bf08e3571146bd0d411415a1ac
>+++ libdwfl/dwfl_module_getdwarf.c      4b53d1c4e185e5f39613ca0beb56ebe8a26e73e0
>@@ -218,6 +218,7 @@ load_symtab (struct dwfl_file *file, str
>             Elf_Scn **symscn, Elf_Scn **xndxscn,
>             size_t *syments, GElf_Word *strshndx)
> {
>+  bool symtab = false;
>   Elf_Scn *scn = NULL;
>   while ((scn = elf_nextscn (file->elf, scn)) != NULL)
>     {
>@@ -226,6 +227,7 @@ load_symtab (struct dwfl_file *file, str
>        switch (shdr->sh_type)
>          {
>          case SHT_SYMTAB:
>+           symtab = true;
>            *symscn = scn;
>            *symfile = file;
>            *strshndx = shdr->sh_link;
>@@ -235,6 +237,8 @@ load_symtab (struct dwfl_file *file, str
>            break;
> 
>          case SHT_DYNSYM:
>+           if (symtab)
>+             break;
>            /* Use this if need be, but keep looking for SHT_SYMTAB.  */
>            *symscn = scn;
>            *symfile = file;
>@@ -244,7 +248,7 @@ load_symtab (struct dwfl_file *file, str
> 
>          case SHT_SYMTAB_SHNDX:
>            *xndxscn = scn;
>-           if (*symscn != NULL)
>+           if (symtab)
>              return DWFL_E_NOERROR;
>            break;
> 
>@@ -253,7 +257,7 @@ load_symtab (struct dwfl_file *file, str
>          }
>     }
> 
>-  if (*symscn != NULL)
>+  if (symtab)
>     /* We found one, though no SHT_SYMTAB_SHNDX to go with it.  */
>     return DWFL_E_NOERROR;

Actions: View

Attachments on bug 438263: 298703 | 298704 | 299049