Attachment 318043 Details for Bug 462689 – libdwfl fix

[patch] libdwfl fix

elfutils-0.137-segment-fix.patch (text/plain), 1.90 KB, created by Roland McGrath on 2008-09-30 06:41:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland McGrath

Created: 2008-09-30 06:41:30 UTC

Size: 1.90 KB

patch

obsolete

>libdwfl/
>2008-09-29  Roland McGrath  <roland@redhat.com>
>
>	* segment.c (insert): Must realloc DWFL->lookup_module here too.
>	(dwfl_report_segment): Clear DWFL->lookup_module before insert calls.
>
>============================================================
>--- libdwfl/segment.c	5809d5b8545ca2f9ad92619a4279bb9909ff5890
>+++ libdwfl/segment.c	891e337440f54572463d91d665c81b9495b9e9b2
>@@ -83,12 +83,26 @@ insert (Dwfl *dwfl, size_t i, GElf_Addr 
>       int *nsegndx = realloc (dwfl->lookup_segndx, sizeof nsegndx[0] * n);
>       if (unlikely (nsegndx == NULL))
> 	{
>-	  free (naddr);
>+	  if (naddr != dwfl->lookup_addr)
>+	    free (naddr);
> 	  return true;
> 	}
>       dwfl->lookup_alloc = n;
>       dwfl->lookup_addr = naddr;
>       dwfl->lookup_segndx = nsegndx;
>+
>+      if (dwfl->lookup_module != NULL)
>+	{
>+	  /* Make sure this array is big enough too.  */
>+	  Dwfl_Module **old = dwfl->lookup_module;
>+	  dwfl->lookup_module = realloc (dwfl->lookup_module,
>+					 sizeof dwfl->lookup_module[0] * n);
>+	  if (unlikely (dwfl->lookup_module == NULL))
>+	    {
>+	      free (old);
>+	      return true;
>+	    }
>+	}
>     }
> 
>   if (unlikely (i < dwfl->lookup_elts))
>@@ -269,6 +283,12 @@ dwfl_report_segment (Dwfl *dwfl, int ndx
> 			    phdr->p_align < dwfl->segment_align))
>     dwfl->segment_align = phdr->p_align;
> 
>+  if (unlikely (dwfl->lookup_module != NULL))
>+    {
>+      free (dwfl->lookup_module);
>+      dwfl->lookup_module = NULL;
>+    }
>+
>   GElf_Addr start = segment_start (dwfl, bias + phdr->p_vaddr);
>   GElf_Addr end = segment_end (dwfl, bias + phdr->p_vaddr + phdr->p_memsz);
> 
>@@ -297,12 +317,6 @@ dwfl_report_segment (Dwfl *dwfl, int ndx
>   dwfl->lookup_tail_offset = end - bias - phdr->p_vaddr + phdr->p_offset;
>   dwfl->lookup_tail_ndx = ndx + 1;
> 
>-  if (unlikely (dwfl->lookup_module != NULL))
>-    {
>-      free (dwfl->lookup_module);
>-      dwfl->lookup_module = NULL;
>-    }
>-
>   return ndx;
> }
> INTDEF (dwfl_report_segment)

Actions: View | Diff

Attachments on bug 462689: 318043