Skip to content

Merge upstream2 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xx-shitai-xx merged 3 commits into from
Apr 3, 2026
Merged

Merge upstream2 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
865bf48
Fixed for Ghidra 11.3.2
DaCodeChick Jun 20, 2025
7e8e50f
Update build.yml
DaCodeChick Jun 20, 2025
27f316f
Merge pull request #64 from DaCodeChick/main
LaurieWired Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ mvnw.cmd
hs_err_pid*
replay_pid*

# Third party JAR files from Ghidra
lib/*.jar

16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/lauriewired/GhidraMCPPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
});
}
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/extension.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading