folly::ElfFile - add support to iterate over program headers

[folly.git] / folly / experimental / symbolizer / Elf.cpp

diff --git a/folly/experimental/symbolizer/Elf.cpp b/folly/experimental/symbolizer/Elf.cpp
index 038bea7a02a64a0de9b25203a971f0d546f193d0..a0dfe9ce9b1e66baa4ba8d140690c7f456519424 100644 (file)
--- a/folly/experimental/symbolizer/Elf.cpp
+++ b/folly/experimental/symbolizer/Elf.cpp
@@ -263,24 +263,18 @@ bool ElfFile::init(const char** msg) {
     }
   }
 
-  const ElfPhdr* programHeader = &at<ElfPhdr>(elfHeader.e_phoff);
-  bool foundBase = false;
-  for (size_t i = 0; i < elfHeader.e_phnum; programHeader++, i++) {
-    // Program headers are sorted by load address, so the first PT_LOAD
-    // header gives us the base address.
-    if (programHeader->p_type == PT_LOAD) {
-      baseAddress_ = programHeader->p_vaddr;
-      foundBase = true;
-      break;
-    }
-  }
+  // Program headers are sorted by load address, so the first PT_LOAD
+  // header gives us the base address.
+  const ElfPhdr* programHeader =
+      iterateProgramHeaders([](auto& h) { return h.p_type == PT_LOAD; });
 
-  if (!foundBase) {
+  if (!programHeader) {
     if (msg) {
       *msg = "could not find base address";
     }
     return false;
   }
+  baseAddress_ = programHeader->p_vaddr;
 
   return true;
 }