Merge pull request #64 from DaCodeChick/main

Fixed for Ghidra 11.3.2

Author: LaurieWired

.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

.gitignore

@@ -49,3 +49,6 @@ mvnw.cmd
 hs_err_pid*
 replay_pid*
 
+# Third party JAR files from Ghidra
+lib/*.jar
+

pom.xml

@@ -15,56 +15,56 @@
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Generic</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Generic.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>SoftwareModeling</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/SoftwareModeling.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Project</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Project.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Docking</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Docking.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Decompiler</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Decompiler.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Utility</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Utility.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Base</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Base.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>ghidra</groupId>
       <artifactId>Gui</artifactId>
-      <version>11.3.1</version>
+      <version>11.3.2</version>
       <scope>system</scope>
       <systemPath>${project.basedir}/lib/Gui.jar</systemPath>
     </dependency>

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) {

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
+version=11.3.2
+ghidraVersion=11.3.2