eliott/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-04-25 17:25:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

GP-6022: Better error reporting when expanding environment variables in

Browse Source 
launch.properties
This commit is contained in:
Ryan Kurtz
2025-10-01 04:59:54 -04:00
parent 5422a77966
commit aef70ea9be
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java
View File

@@ -182,14 +182,23 @@ public class LaunchProperties {
*
* @param text The string to expand environment variables in
* @return The given string, but with set environment variables expanded
* @throws ParseException if there was a problem expanding an environment variable
*/
private static String expandEnvVars(String text) {
private static String expandEnvVars(String text) throws ParseException {
Map<String, String> envMap = System.getenv();
for (Entry<String, String> entry : envMap.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
text = text.replaceAll("\\$\\{" + key + "\\}", value.replace("\\", "\\\\"));
}
return text;
}
for (Entry<String, String> entry : envMap.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
try {
text = text.replaceAll("\\$\\{" + key + "\\}", value.replace("\\", "\\\\"));
}
catch (IllegalArgumentException e) {
throw new ParseException(
"Error expanding environment variable in %s (env %s=%s) -- %s".formatted(text,
key, value, e.getMessage()),
0);
}
}
return text;
}
}