From 3d667024cc3e3aaec5d6f37b6c19e2be2cf9c91e Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:19:29 -0400 Subject: [PATCH] Use String Methods - Revert length check, test for empty string Needs a lot of parentheses but it works --- src/main/java/cafeloader/Cafe_ElfExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cafeloader/Cafe_ElfExtension.java b/src/main/java/cafeloader/Cafe_ElfExtension.java index 77cfcfd..2f70d10 100644 --- a/src/main/java/cafeloader/Cafe_ElfExtension.java +++ b/src/main/java/cafeloader/Cafe_ElfExtension.java @@ -311,7 +311,7 @@ public class Cafe_ElfExtension extends ElfExtension { Address tagAddress = fileInfoAddr.add(tagOffset); while (true) { Data d = elfLoadHelper.createData(tagAddress, TerminatedStringDataType.dataType); - if (d == null || d.getLength() <= 1) { // empty string has a length of 1 (just a null terminator) + if (d == null || d.getLength() == 0 || (d.hasStringValue() && ((String)d.getValue()).isEmpty())) { break; } tagAddress = tagAddress.add(d.getLength());