Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 06:19:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-11-14 13:17:20 -05:00
parent 707ec9288d e19ac547c5
commit a895e3c48f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/linux/LinuxPtySessionLeader.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class LinuxPtySessionLeader {
} }
} }
System.err.println("Could not execute " + subArgs.get(0) + ": " + t.getMessage()); System.err.println("Could not execute " + subArgs.get(0) + ": " + t.getMessage());
System.exit(-1); System.exit(127);
} }
} }
} }
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/pty/linux/LinuxPtyTest.java
+2 -3
View File
@@ -84,10 +84,9 @@ public class LinuxPtyTest extends AbstractPtyTest {
PtySession dies = PtySession dies =
pty.getChild().session(new String[] { "thisHadBetterNotExist" }, null); pty.getChild().session(new String[] { "thisHadBetterNotExist" }, null);
/** /**
* NOTE: Java subprocess dies with code 1 on unhandled exception. TODO: Is there a nice * Choice of 127 is based on bash setting "exit code" to 127 for "command not found"
* way to distinguish whether the code is from java or the execed image?
*/ */
assertEquals(1, dies.waitExited()); assertEquals(127, dies.waitExited());
} }
} }