Fixed a bug where courgette would fail if a relocation entry pointed to a section that isn't a progbits section, e.g., an init_array section

This fix will check whether the relocation address is inside of an ELF section that isn't PROGBITS, and skip the relocation address if it is inside.

BUG=246763

Review URL: https://chromiumcodereview.appspot.com/16658003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205872 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 1 deletions

diff --git a/courgette/disassembler_elf_32_x86.cc b/courgette/disassembler_elf_32_x86.cc
index 6e3935c..a857c96 100644
--- a/courgette/disassembler_elf_32_x86.cc
+++ b/courgette/disassembler_elf_32_x86.cc
@@ -305,8 +305,29 @@ CheckBool DisassemblerElf32X86::ParseFile(AssemblyProgram* program) {
           return false;
         file_offset = section_header->sh_offset + section_header->sh_size;
         break;
-      default:
+      case SHT_NOBITS:
+        // Fall through
+      case SHT_INIT_ARRAY:
+        // Fall through
+      case SHT_FINI_ARRAY:
+        while (current_abs_offset != end_abs_offset &&
+               *current_abs_offset >= section_header->sh_offset &&
+               *current_abs_offset <
+               (section_header->sh_offset + section_header->sh_size)) {
+          // Skip any abs_offsets appear in the unsupported INIT_ARRAY section
+          VLOG(1) << "Skipping relocation entry for unsupported section: " <<
+            section_header->sh_type;
+          current_abs_offset++;
+        }
         break;
+      default:
+        if (current_abs_offset != end_abs_offset &&
+               *current_abs_offset >= section_header->sh_offset &&
+               *current_abs_offset <
+               (section_header->sh_offset + section_header->sh_size))
+          VLOG(1) << "Relocation address in unrecognized ELF section: " << \
+            section_header->sh_type;
+      break;
     }
   }