Merge branch 'main' into dependabot/github_actions/actions/checkout-5

Author: andyjsmith

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-	val jadxVersion = "1.5.2-SNAPSHOT"
+	val jadxVersion = "1.5.2"
 	val isJadxSnapshot = jadxVersion.endsWith("-SNAPSHOT")
 
 	// use compile only scope to exclude jadx-core and its dependencies from result jar

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/NativeLibrariesPlugin.java

@@ -20,7 +20,7 @@ public JadxPluginInfo getPluginInfo() {
 				.name("Native Library Info")
 				.description(DESCRIPTION)
 				.homepage("https://github.com/andyjsmith/jadx-native-libraries-plugin")
-				.requiredJadxVersion("1.5.2, r2372")
+				.requiredJadxVersion("1.5.2, r2472")
 				.build();
 	}
 

src/main/java/org/ajsmith/jadx/plugins/nativelibraries/components/NativeRoot.java

@@ -6,6 +6,7 @@
 import jadx.api.plugins.gui.JadxGuiContext;
 import net.fornwall.jelf.ElfFile;
 import net.fornwall.jelf.ElfSymbol;
+import net.fornwall.jelf.ElfSymbolTableSection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -48,7 +49,14 @@ public void loadFromResource(ResourceFile resource) {
 
 		// Parse symbols to find exported methods
 		ElfFile elf = ElfFile.from(bytes);
-		for (ElfSymbol symbol : elf.getDynamicSymbolTableSection().symbols) {
+
+		ElfSymbolTableSection dynSymSection = elf.getDynamicSymbolTableSection();
+		if (dynSymSection == null) {
+			LOG.debug("No dynamic symbol table section was found");
+			return;
+		}
+
+		for (ElfSymbol symbol : dynSymSection.symbols) {
 			String name = symbol.getName();
 			if (!NativeMethod.isJavaMethod(name)) continue;
 

src/test/java/org/ajsmith/jadx/plugins/nativelibraries/TestUtils.java

@@ -1,5 +1,7 @@
 package org.ajsmith.jadx.plugins.nativelibraries;
 
+import jadx.api.JadxArgs;
+import jadx.api.JadxDecompiler;
 import jadx.api.ResourceFile;
 import jadx.api.ResourceType;
 import org.ajsmith.jadx.plugins.nativelibraries.components.NativeLibrary;
@@ -13,7 +15,9 @@
 
 public class TestUtils {
 	protected static NativeLibrary createMockLibrary() {
-		return new NativeLibrary(ResourceFile.createResourceFile(null, "lib.so", ResourceType.LIB), null);
+		JadxArgs args = new JadxArgs();
+		JadxDecompiler jadx = new JadxDecompiler(args);
+		return new NativeLibrary(ResourceFile.createResourceFile(jadx, "lib.so", ResourceType.LIB), null);
 	}
 
 	protected static File getSampleFile(String fileName) throws URISyntaxException {