Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 13:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-5029_ghidracadabra_PR-7087_gemesa_bsim-runcmd-stderr'
This commit is contained in:
Ryan Kurtz 2024-11-12 11:36:52 -05:00
commit 7e0a96e477
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/BSimControlLaunchable.java
View File

@ -98,7 +98,7 @@ public class BSimControlLaunchable implements GhidraLaunchable {
private static final Set<String> DROPUSER_OPTIONS = Set.of(); private static final Set<String> DROPUSER_OPTIONS = Set.of();
private static final Set<String> CHANGEAUTH_OPTIONS = Set.of( private static final Set<String> CHANGEAUTH_OPTIONS = Set.of(
AUTH_OPTION, DN_OPTION, NO_LOCAL_AUTH_OPTION, CAFILE_OPTION); AUTH_OPTION, DN_OPTION, NO_LOCAL_AUTH_OPTION, CAFILE_OPTION);
//@formatter:on //@formatter:on
private static final Map<String, Set<String>> ALLOWED_OPTION_MAP = new HashMap<>(); private static final Map<String, Set<String>> ALLOWED_OPTION_MAP = new HashMap<>();
static { static {
@ -671,8 +671,7 @@ public class BSimControlLaunchable implements GhidraLaunchable {
/** /**
* Invoke an external executable/command, display the output and error streams on the console, * Invoke an external executable/command, display the output and error streams on the console,
* the exit condition of the command is returned. If the exit condition indicates and error, * and return the exit value of the command.
* but a line of the error stream matches a provided String, the error is suppressed
* @param directory is the working directory for the command * @param directory is the working directory for the command
* @param command is the command-line (including arguments) * @param command is the command-line (including arguments)
* @param envvar if non-null, is an environment variable to set for the command * @param envvar if non-null, is an environment variable to set for the command
@ -692,8 +691,9 @@ public class BSimControlLaunchable implements GhidraLaunchable {
Process process = processBuilder.start(); Process process = processBuilder.start();
new IOThread(process.getInputStream(), true).start(); new IOThread(process.getInputStream(), true).start();
IOThread errThread = new IOThread(process.getErrorStream(), true); IOThread errThread = new IOThread(process.getErrorStream(), false);
errThread.start(); errThread.start();
errThread.join(); // Ensure all stderr output is processed to avoid mixed-up console output
int retval = process.waitFor(); int retval = process.waitFor();
return retval; return retval;
@ -1521,7 +1521,7 @@ public class BSimControlLaunchable implements GhidraLaunchable {
try { try {
while ((line = shellOutput.readLine()) != null) { while ((line = shellOutput.readLine()) != null) {
if (!suppressOutput) { if (!suppressOutput) {
System.out.println(line); System.out.println(" " + line);
} }
} }
} }