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

Merge remote-tracking branch

Browse Source 
'origin/GP-2533_Dan_issue4583-removeNosections' (Closes #4583)
This commit is contained in:
Ryan Kurtz
2022-09-24 02:02:39 -04:00
parent 7ea1bbc360 4f5f99384d
commit 1cdb68b03e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbInferiorImpl.java
+2 -2
View File
@@ -245,11 +245,11 @@ public class GdbInferiorImpl implements GdbInferior {
// "nosections" is an unlikely section name. Goal is to exclude section lines. // "nosections" is an unlikely section name. Goal is to exclude section lines.
// TODO: Would be nice to save this switch, or better, choose at start based on version // TODO: Would be nice to save this switch, or better, choose at start based on version
CompletableFuture<String> future = CompletableFuture<String> future =
consoleCapture("maintenance info sections ALLOBJ nosections", consoleCapture("maintenance info sections ALLOBJ",
CompletesWithRunning.CANNOT); CompletesWithRunning.CANNOT);
return future.thenCompose(output -> { return future.thenCompose(output -> {
if (output.split("\n").length <= 1) { if (output.split("\n").length <= 1) {
return consoleCapture("maintenance info sections -all-objects nosections") return consoleCapture("maintenance info sections -all-objects")
.thenApply(out2 -> parseModuleNames(out2, true)); .thenApply(out2 -> parseModuleNames(out2, true));
} }
return CompletableFuture.completedFuture(parseModuleNames(output, false)); return CompletableFuture.completedFuture(parseModuleNames(output, false));