Skip to content

Fix call Bindiff hanging #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix call Bindiff hanging #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions src/main/java/bindiffhelper/BinDiffHelperPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,26 +182,30 @@ public void callBinDiff(DomainFile df, Consumer<File[]> callback)
Msg.debug(this, "printing BD output for cmd: " + Arrays.toString(cmd));
Process p = null;
try {
p = Runtime.getRuntime().exec(cmd);
var i = new BufferedReader(new InputStreamReader(p.getInputStream()));
var stderr = p.getErrorStream();
while (!p.waitFor(1, TimeUnit.SECONDS)) {
// Empty stderr buffer
stderr.skip(stderr.available());

while (true)
{
String line = i.readLine();

if (line == null)
break;

Msg.debug(this, ">" + line);
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.redirectErrorStream(true);
p = pb.start();

Process finalP = p;
Thread outputReader = new Thread(() -> {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(finalP.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
Msg.debug(this, "> " + line);
}
} catch (IOException e) {
e.printStackTrace();
}

});
outputReader.start();

while (!p.waitFor(1, TimeUnit.SECONDS)) {
d.checkCanceled();
}


outputReader.join();
int exitCode = p.exitValue();
Msg.debug(this, "Process exited with code: " + exitCode);
Msg.debug(this, "end of output");

} catch (IOException | InterruptedException e) {
Expand Down
Loading