segment_report_module: Get rid of variable-length arrays

This prevents a jump which is needed in a later patch.

Signed-off-by: Timm Bäder <tbaeder@redhat.com>

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 344db7c1d62ae13e557e350ef73225bf1b4368e2..791cb8700639dcbefd413b2af061178f8f2872e6 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-12  Timm Bäder <tbaeder@redhat.com>
+
+       * dwfl_segment_report_module.c (dwfl_segment_report_module): Declare
+       p32 and p64 as pointers instead of arrays.
+
 2020-09-18  Mark Wielaard  <mark@klomp.org>
 
        * zstd.c: New file.

diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c
index 430e13d57ce82d8f54b3a04e22bcbf0dd9fe3bb0..dd3fdb9e563280ec3b54f65b2f6109b72f69cc74 100644 (file)
--- a/libdwfl/dwfl_segment_report_module.c
+++ b/libdwfl/dwfl_segment_report_module.c
@@ -606,18 +606,18 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
       }
   }
 
-  Elf32_Phdr (*p32)[phnum] = phdrsp;
-  Elf64_Phdr (*p64)[phnum] = phdrsp;
+  Elf32_Phdr *p32 = phdrsp;
+  Elf64_Phdr *p64 = phdrsp;
   if (ei_class == ELFCLASS32)
     {
       if (elf32_xlatetom (&xlateto, &xlatefrom, ei_data) == NULL)
        found_bias = false;     /* Trigger error check.  */
       else
        for (uint_fast16_t i = 0; i < phnum; ++i)
-         consider_phdr ((*p32)[i].p_type,
-                        (*p32)[i].p_vaddr, (*p32)[i].p_memsz,
-                        (*p32)[i].p_offset, (*p32)[i].p_filesz,
-                        (*p32)[i].p_align);
+         consider_phdr (p32[i].p_type,
+                        p32[i].p_vaddr, p32[i].p_memsz,
+                        p32[i].p_offset, p32[i].p_filesz,
+                        p32[i].p_align);
     }
   else
     {
@@ -625,10 +625,10 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
        found_bias = false;     /* Trigger error check.  */
       else
        for (uint_fast16_t i = 0; i < phnum; ++i)
-         consider_phdr ((*p64)[i].p_type,
-                        (*p64)[i].p_vaddr, (*p64)[i].p_memsz,
-                        (*p64)[i].p_offset, (*p64)[i].p_filesz,
-                        (*p64)[i].p_align);
+         consider_phdr (p64[i].p_type,
+                        p64[i].p_vaddr, p64[i].p_memsz,
+                        p64[i].p_offset, p64[i].p_filesz,
+                        p64[i].p_align);
     }
 
   finish_portion (&ph_buffer, &ph_buffer_size);
@@ -796,8 +796,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
        dyn_filesz = dyn_data_size;
 
       void *dyns = malloc (dyn_filesz);
-      Elf32_Dyn (*d32)[dyn_filesz / sizeof (Elf32_Dyn)] = dyns;
-      Elf64_Dyn (*d64)[dyn_filesz / sizeof (Elf64_Dyn)] = dyns;
+      Elf32_Dyn *d32 = dyns;
+      Elf64_Dyn *d64 = dyns;
       if (unlikely (dyns == NULL))
        return finish ();
 
@@ -811,14 +811,14 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
        {
          if (elf32_xlatetom (&xlateto, &xlatefrom, ei_data) != NULL)
            for (size_t i = 0; i < dyn_filesz / sizeof (Elf32_Dyn); ++i)
-             if (consider_dyn ((*d32)[i].d_tag, (*d32)[i].d_un.d_val))
+             if (consider_dyn (d32[i].d_tag, d32[i].d_un.d_val))
                break;
        }
       else
        {
          if (elf64_xlatetom (&xlateto, &xlatefrom, ei_data) != NULL)
            for (size_t i = 0; i < dyn_filesz / sizeof (Elf64_Dyn); ++i)
-             if (consider_dyn ((*d64)[i].d_tag, (*d64)[i].d_un.d_val))
+             if (consider_dyn (d64[i].d_tag, d64[i].d_un.d_val))
                break;
        }
       free (dyns);
@@ -937,12 +937,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
 
          if (ei_class == ELFCLASS32)
            for (uint_fast16_t i = 0; i < phnum; ++i)
-             read_phdr ((*p32)[i].p_type, (*p32)[i].p_vaddr,
-                        (*p32)[i].p_offset, (*p32)[i].p_filesz);
+             read_phdr (p32[i].p_type, p32[i].p_vaddr,
+                        p32[i].p_offset, p32[i].p_filesz);
          else
            for (uint_fast16_t i = 0; i < phnum; ++i)
-             read_phdr ((*p64)[i].p_type, (*p64)[i].p_vaddr,
-                        (*p64)[i].p_offset, (*p64)[i].p_filesz);
+             read_phdr (p64[i].p_type, p64[i].p_vaddr,
+                        p64[i].p_offset, p64[i].p_filesz);
        }
       else
        {