Only get the ElfSectionHeader in the RelocationHandler if it's not a …

…special section header index to avoid a ArrayIndexOutOfBoundsException
Maschell · Oct 11, 2019 · fb3ec7f · fb3ec7f
1 parent 0005907
commit fb3ec7f
Showing 1 changed file with 37 additions and 34 deletions.
diff --git a/src/main/java/cafeloader/Cafe_ElfRelocationHandler.java b/src/main/java/cafeloader/Cafe_ElfRelocationHandler.java
@@ -44,40 +44,43 @@ public void relocate(ElfRelocationContext elfRelocationContext, ElfRelocation re
 		 * reference because it will be too far away for the actual relocation to
 		 * be valid itself.
 		 */
-		ElfSectionHeader symbolSection = elf.getSections()[sym.getSectionHeaderIndex()];
-		if (symbolSection.getType() == Cafe_ElfExtension.SHT_RPL_IMPORTS.value) {
-			String symbolSectionName = symbolSection.getNameAsString();
-			boolean isDataImport = false;
-			if (symbolSectionName.startsWith(".dimport_")) {
-				program.getReferenceManager().addMemoryReference(relocationAddress,
-					elfRelocationContext.getSymbolAddress(sym), RefType.DATA, SourceType.IMPORTED, 0);
-				isDataImport = true;
-			} else if (symbolSectionName.startsWith(".fimport_")) {
-				program.getReferenceManager().addMemoryReference(relocationAddress,
-					elfRelocationContext.getSymbolAddress(sym), RefType.UNCONDITIONAL_CALL, SourceType.IMPORTED, 0);
-			}
-
-			String rplName = symbolSectionName.split("import_")[1];
-			if (!rplName.endsWith(".rpl")) {
-				 rplName += ".rpl";
-			}
-
-			ExternalLocation location = program.getExternalManager().getUniqueExternalLocation(rplName, sym.getNameAsString());
-			if (location != null) {
-				try {
-					if (isDataImport) {
-						program.getReferenceManager().addExternalReference(relocationAddress, 1,
-								  location, SourceType.IMPORTED, RefType.DATA);
-					} else {
-						program.getReferenceManager().addExternalReference(relocationAddress, 1,
-								  location, SourceType.IMPORTED, RefType.UNCONDITIONAL_CALL);
-					}
-				} catch (InvalidInputException e) {
-					Msg.warn(this, "addExternalReference failed with " + e);
-				}
-			} else {
-				Msg.warn(this, "Failed to find location for " + sym.getNameAsString());
-			}
+
+		if (sym.getSectionHeaderIndex() > 0) {	
+    		ElfSectionHeader symbolSection = elf.getSections()[sym.getSectionHeaderIndex()];
+    		if (symbolSection.getType() == Cafe_ElfExtension.SHT_RPL_IMPORTS.value) {
+    			String symbolSectionName = symbolSection.getNameAsString();
+    			boolean isDataImport = false;
+    			if (symbolSectionName.startsWith(".dimport_")) {
+    				program.getReferenceManager().addMemoryReference(relocationAddress,
+    					elfRelocationContext.getSymbolAddress(sym), RefType.DATA, SourceType.IMPORTED, 0);
+    				isDataImport = true;
+    			} else if (symbolSectionName.startsWith(".fimport_")) {
+    				program.getReferenceManager().addMemoryReference(relocationAddress,
+    					elfRelocationContext.getSymbolAddress(sym), RefType.UNCONDITIONAL_CALL, SourceType.IMPORTED, 0);
+    			}
+
+    			String rplName = symbolSectionName.split("import_")[1];
+    			if (!rplName.endsWith(".rpl")) {
+    				 rplName += ".rpl";
+    			}
+
+    			ExternalLocation location = program.getExternalManager().getUniqueExternalLocation(rplName, sym.getNameAsString());
+    			if (location != null) {
+    				try {
+    					if (isDataImport) {
+    						program.getReferenceManager().addExternalReference(relocationAddress, 1,
+    								  location, SourceType.IMPORTED, RefType.DATA);
+    					} else {
+    						program.getReferenceManager().addExternalReference(relocationAddress, 1,
+    								  location, SourceType.IMPORTED, RefType.UNCONDITIONAL_CALL);
+    					}
+    				} catch (InvalidInputException e) {
+    					Msg.warn(this, "addExternalReference failed with " + e);
+    				}
+    			} else {
+    				Msg.warn(this, "Failed to find location for " + sym.getNameAsString());
+    			}
+    		}
 		}
 
 		switch (type) {