From 2a6e9bacea3c59facbc2df7b9cf2b342f9b19267 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 28 Aug 2026 06:44:28 -0400 Subject: [PATCH 1/2] GP-7172: Pass -- to native swift demangler to indicate end of flags --- .../ghidra/app/util/demangler/swift/SwiftNativeDemangler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftNativeDemangler.java b/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftNativeDemangler.java index 1fe4e40e36..0fa5a5758c 100644 --- a/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftNativeDemangler.java +++ b/Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftNativeDemangler.java @@ -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())); From cdf9542249e3be5a3f50553c82f376ad1c5567a3 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 28 Aug 2026 07:13:24 -0400 Subject: [PATCH 2/2] GP-7171: Upgrading commons-collections4 to 4.6.0 --- Ghidra/Framework/Generic/Module.manifest | 2 +- Ghidra/Framework/Generic/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index af96a293f1..f2d5499ce4 100644 --- a/Ghidra/Framework/Generic/Module.manifest +++ b/Ghidra/Framework/Generic/Module.manifest @@ -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 diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle index 4fa145d166..21de831696 100644 --- a/Ghidra/Framework/Generic/build.gradle +++ b/Ghidra/Framework/Generic/build.gradle @@ -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"