Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6704: Fixed expanding env vars in launch.properties when they contained regex chars (Closes #9061)

Ryan Kurtz79da29c6f60e
diff --git a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
index bca5dea6e6..78fd127ba0 100644
--- a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
+++ b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
@@ -124,7 +124,7 @@ public class LaunchSupport {
}
}
catch (Exception e) {
- System.err.println(e.getMessage());
+ e.printStackTrace(System.err);
}
System.exit(exitCode);
diff --git a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java
index f0b25fd987..a1462a92a1 100644
--- a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java
+++ b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java
@@ -220,7 +220,7 @@ public class LaunchProperties {
String key = entry.getKey();
String value = entry.getValue();
try {
- text = text.replaceAll("\\$\\{" + key + "\\}", value.replace("\\", "\\\\"));
+ text = text.replace("${" + key + "}", value);
}
catch (IllegalArgumentException e) {
String msg =