Merge pull request #364 from laqieer/master

bugfix: crash when loading elf
visualboyadvance-m · Feb 5, 2019 · ed29b9c · ed29b9c
2 parents eb6dfb4 + 7b350c0
commit ed29b9c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/gba/elf.cpp b/src/gba/elf.cpp
@@ -2604,18 +2604,18 @@ bool elfReadProgram(ELFHeader* eh, uint8_t* data, unsigned long data_size, int&
     sh = (ELFSectionHeader**)
         malloc(sizeof(ELFSectionHeader*) * count);
 
-    stringTable = (char*)elfReadSection(data, sh[READ16LE(&eh->e_shstrndx)]);
-
-    elfSectionHeaders            = sh;
-    elfSectionHeadersStringTable = stringTable;
-    elfSectionHeadersCount       = count;
-
     for (i = 0; i < count; i++) {
         sh[i] = (ELFSectionHeader*)p;
         p += sizeof(ELFSectionHeader);
         if (READ16LE(&eh->e_shentsize) != sizeof(ELFSectionHeader))
             p += READ16LE(&eh->e_shentsize) - sizeof(ELFSectionHeader);
     }
+
+	stringTable = (char*)elfReadSection(data, sh[READ16LE(&eh->e_shstrndx)]);
+
+    elfSectionHeaders            = sh;
+    elfSectionHeadersStringTable = stringTable;
+    elfSectionHeadersCount       = count;
 
     for (i = 0; i < count; i++) {
         //    printf("SH %d %-20s %08x %08x %08x %08x %08x %08x %08x %08x\n",