mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-08-28 07:24:37 -04:00
parent 483d64b0fc cdf9542249
commit 9f377f1cbd
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/SwiftNativeDemangler.java
View File

@@ -144,6 +144,7 @@ public class SwiftNativeDemangler {
command.add("demangle");
}
command.addAll(options);
command.add("--"); // indicate end of flags
command.add(mangled);
Process p = new ProcessBuilder(command).redirectErrorStream(true).start();
return new BufferedReader(new InputStreamReader(p.getInputStream()));

2
Ghidra/Framework/Generic/Module.manifest
View File

@@ -5,7 +5,7 @@ MODULE FILE LICENSE: lib/failureaccess-1.0.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/jdom2-2.0.6.1.jar JDOM License
MODULE FILE LICENSE: lib/log4j-api-2.26.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/log4j-core-2.26.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-collections4-4.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-collections4-4.6.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-lang3-3.20.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-io-2.19.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-text-1.10.0.jar Apache License 2.0

2
Ghidra/Framework/Generic/build.gradle
View File

@@ -36,7 +36,7 @@ dependencies {
api "org.jdom:jdom2:2.0.6.1"
api "org.apache.logging.log4j:log4j-api:2.26.1"
api "org.apache.logging.log4j:log4j-core:2.26.1"
api "org.apache.commons:commons-collections4:4.1"
api "org.apache.commons:commons-collections4:4.6.0"
api "org.apache.commons:commons-compress:1.27.1" // requires commons-codec
api "commons-codec:commons-codec:1.18.0"
api "org.apache.commons:commons-lang3:3.20.0"