diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bc01771..868268ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,8 @@ jobs: build: runs-on: ubuntu-latest env: - GHIDRA_VERSION: 11.3.1 - GHIDRA_DATE: 20250219 + GHIDRA_VERSION: 11.3.2 + GHIDRA_DATE: 20250415 GHIDRA_LIBS: >- Features/Base/lib/Base.jar Features/Decompiler/lib/Decompiler.jar diff --git a/.gitignore b/.gitignore index 0701e633..2bdf632f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,6 @@ mvnw.cmd hs_err_pid* replay_pid* +# Third party JAR files from Ghidra +lib/*.jar + diff --git a/pom.xml b/pom.xml index aa7c31dc..6452d96e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,56 +15,56 @@ ghidra Generic - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Generic.jar ghidra SoftwareModeling - 11.3.1 + 11.3.2 system ${project.basedir}/lib/SoftwareModeling.jar ghidra Project - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Project.jar ghidra Docking - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Docking.jar ghidra Decompiler - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Decompiler.jar ghidra Utility - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Utility.jar ghidra Base - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Base.jar ghidra Gui - 11.3.1 + 11.3.2 system ${project.basedir}/lib/Gui.jar diff --git a/src/main/java/com/lauriewired/GhidraMCPPlugin.java b/src/main/java/com/lauriewired/GhidraMCPPlugin.java index a04c910b..88583bab 100644 --- a/src/main/java/com/lauriewired/GhidraMCPPlugin.java +++ b/src/main/java/com/lauriewired/GhidraMCPPlugin.java @@ -530,7 +530,7 @@ private boolean renameFunction(String oldName, String newName) { Msg.error(this, "Error renaming function", e); } finally { - program.endTransaction(tx, successFlag.get()); + successFlag.set(program.endTransaction(tx, successFlag.get())); } }); } @@ -652,7 +652,7 @@ private String renameVariableInFunction(String functionName, String oldVarName, Msg.error(this, "Failed to rename variable", e); } finally { - program.endTransaction(tx, true); + successFlag.set(program.endTransaction(tx, true)); } }); } catch (InterruptedException | InvocationTargetException e) { @@ -875,7 +875,7 @@ private boolean setCommentAtAddress(String addressStr, String comment, int comme } catch (Exception e) { Msg.error(this, "Error setting " + transactionName.toLowerCase(), e); } finally { - program.endTransaction(tx, success.get()); + success.set(program.endTransaction(tx, success.get())); } }); } catch (InterruptedException | InvocationTargetException e) { diff --git a/src/main/resources/extension.properties b/src/main/resources/extension.properties index b0c5ea9b..3ca8018c 100644 --- a/src/main/resources/extension.properties +++ b/src/main/resources/extension.properties @@ -2,5 +2,5 @@ name=GhidraMCP description=A plugin that runs an embedded HTTP server to expose program data. author=LaurieWired createdOn=2025-03-22 -version=11.3.1 -ghidraVersion=11.3.1 \ No newline at end of file +version=11.3.2 +ghidraVersion=11.3.2 \ No newline at end of file