Imported Upstream version 0.160

[platform/upstream/elfutils.git] / libdw / fde.c

diff --git a/libdw/fde.c b/libdw/fde.c
index d366768..91ce732 100644 (file)
--- a/libdw/fde.c
+++ b/libdw/fde.c
@@ -83,7 +83,11 @@ intern_fde (Dwarf_CFI *cache, const Dwarf_FDE *entry)
                                    &fde->instructions, &fde->start))
       || unlikely (read_encoded_value (cache, cie->fde_encoding & 0x0f,
                                       &fde->instructions, &fde->end)))
-    return NULL;
+    {
+      free (fde);
+      __libdw_seterrno (DWARF_E_INVALID_DWARF);
+      return NULL;
+    }
   fde->end += fde->start;
 
   fde->cie = cie;
@@ -181,32 +185,30 @@ binary_search_fde (Dwarf_CFI *cache, Dwarf_Addr address)
        u = idx;
       else
        {
+         l = idx + 1;
+
          Dwarf_Addr fde;
          if (unlikely (read_encoded_value (&dummy_cfi,
                                            cache->search_table_encoding, &p,
                                            &fde)))
            break;
-         if (address >= start)
+
+         /* If this is the last entry, its upper bound is assumed to be
+            the end of the module.
+            XXX really should be end of containing PT_LOAD segment */
+         if (l < cache->search_table_entries)
            {
-             l = idx + 1;
-
-             /* If this is the last entry, its upper bound is assumed to be
-                the end of the module.
-                XXX really should be end of containing PT_LOAD segment */
-             if (l < cache->search_table_entries)
-               {
-                 /* Look at the start address in the following entry.  */
-                 Dwarf_Addr end;
-                 if (unlikely (read_encoded_value
-                               (&dummy_cfi, cache->search_table_encoding, &p,
-                                &end)))
-                   break;
-                 if (address >= end)
-                   continue;
-               }
-
-             return fde - cache->frame_vaddr;
+             /* Look at the start address in the following entry.  */
+             Dwarf_Addr end;
+             if (unlikely (read_encoded_value
+                           (&dummy_cfi, cache->search_table_encoding, &p,
+                            &end)))
+               break;
+             if (address >= end)
+               continue;
            }
+
+         return fde - cache->frame_vaddr;
        }
     }
 
@@ -231,12 +233,17 @@ __libdw_find_fde (Dwarf_CFI *cache, Dwarf_Addr address)
       if (offset == (Dwarf_Off) -1l)
        goto no_match;
       struct dwarf_fde *fde = __libdw_fde_by_offset (cache, offset);
-      if (unlikely (fde != NULL)
-         /* Sanity check the address range.  */
-         && unlikely (address < fde->start || address >= fde->end))
+      if (likely (fde != NULL))
        {
-         __libdw_seterrno (DWARF_E_INVALID_DWARF);
-         return NULL;
+         /* Sanity check the address range.  */
+         if (unlikely (address < fde->start))
+           {
+             __libdw_seterrno (DWARF_E_INVALID_DWARF);
+             return NULL;
+           }
+         /* .eh_frame_hdr does not indicate length covered by FDE.  */
+         if (unlikely (address >= fde->end))
+           goto no_match;
        }
       return fde;
     }