Merge pull request #384 from lief-project/revert-382-always-parse-sec…

…tion-relocs Revert "Binaries generated with --emit-relocs have dynamic and section relocations"
lief-project · Mar 14, 2020 · 1014ba0 · 1014ba0
2 parents f210e6b + e39f939
commit 1014ba0
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/ELF/Parser.tcc b/src/ELF/Parser.tcc
@@ -430,25 +430,26 @@ void Parser::parse_binary(void) {
   }
 
   // Try to parse using sections
+  if (this->binary_->relocations_.size() == 0) {
+    for (const Section& section : this->binary_->sections()) {
 
-  for (const Section& section : this->binary_->sections()) {
+      try {
+        if (section.type() == ELF_SECTION_TYPES::SHT_REL) {
 
-    try {
-      if (section.type() == ELF_SECTION_TYPES::SHT_REL) {
-        this->parse_section_relocations<ELF_T, typename ELF_T::Elf_Rel>(section);
-      }
-      else if (section.type() == ELF_SECTION_TYPES::SHT_RELA) {
-        this->parse_section_relocations<ELF_T, typename ELF_T::Elf_Rela>(section);
-      }
+          this->parse_section_relocations<ELF_T, typename ELF_T::Elf_Rel>(section);
+        }
+        else if (section.type() == ELF_SECTION_TYPES::SHT_RELA) {
+          this->parse_section_relocations<ELF_T, typename ELF_T::Elf_Rela>(section);
+        }
 
-    } catch (const exception& e) {
-      LOG(WARNING) << "Unable to parse relocations from section '"
-                   << section.name() << "'"
-                   << " (" << e.what() << ")";
+      } catch (const exception& e) {
+        LOG(WARNING) << "Unable to parse relocations from section '"
+                     << section.name() << "'"
+                     << " (" << e.what() << ")";
+      }
     }
   }
 
-
   this->link_symbol_version();
   this->parse_overlay();
 }