mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-1693 protect against NPE with BlockStreamServer

Browse Source
This commit is contained in:
ghidra1
2022-01-24 14:37:39 -05:00
parent c39d792e9a
commit 9bf394f90a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/BlockStreamServer.java
View File

@@ -315,11 +315,12 @@ public class BlockStreamServer extends Thread {
}
else if (!(e instanceof EOFException)) { // silent on closed connection
log.error("file block stream failed from " + socket.getInetAddress() + ": " +
e.getMessage());
e.getMessage(), e);
}
}
finally {
if (!success && (registration.blockStream instanceof InputBlockStream)) {
if (!success && (registration != null) &&
(registration.blockStream instanceof InputBlockStream)) {
// ensure input stream is closed since it can be terminated by client,
// let client handle error if any
try {
@@ -337,7 +338,9 @@ public class BlockStreamServer extends Thread {
// ignore
}
}
registration.state = HandlerConnectionState.CLOSED;
if (registration != null) {
registration.state = HandlerConnectionState.CLOSED;
}
}
}