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

GT-2856 Corrected SPE caused by project restore of non-checked-out file

Browse Source
This commit is contained in:
ghidra1 2019-05-08 17:33:13 -04:00
parent c9ac20f6e7
commit d03b715f39
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java
View File

@ -45,7 +45,8 @@ import ghidra.framework.main.OpenVersionedFileDialog;
import ghidra.framework.model.*;
import ghidra.framework.options.*;
import ghidra.framework.plugintool.*;
import ghidra.framework.plugintool.util.*;
import ghidra.framework.plugintool.util.PluginStatus;
import ghidra.framework.plugintool.util.ToolConstants;
import ghidra.framework.protocol.ghidra.*;
import ghidra.program.database.ProgramContentHandler;
import ghidra.program.model.address.*;
@ -1017,6 +1018,9 @@ public class ProgramManagerPlugin extends Plugin implements ProgramManager {
return;
}
// restore state should not ask about checking out
openTask.setNoCheckout();
try {
new TaskLauncher(openTask, tool.getToolFrame(), 100);
}

35
Ghidra/Features/Base/src/main/java/ghidra/app/util/task/OpenProgramTask.java
View File

@ -42,7 +42,8 @@ public class OpenProgramTask extends Task {
private List<Program> programList = new ArrayList<>();
private TaskMonitor monitor;
private final Object consumer;
private boolean silent;
private boolean silent; // if true operation does not permit interaction
private boolean noCheckout; // if true operation should not perform optional checkout
private String openPromptText = "Open";
@ -91,10 +92,25 @@ public class OpenProgramTask extends Task {
domainFileInfoList.add(new DomainFileInfo(domainFile, version, forceReadOnly));
}
/**
* Invoking this method prior to task execution will prevent
* any confirmation interaction with the user (e.g.,
* optional checkout, snapshot recovery, etc.). Errors
* may still be displayed if they occur.
*/
public void setSilent() {
this.silent = true;
}
/**
* Invoking this method prior to task execution will prevent
* the use of optional checkout which require prompting the
* user.
*/
public void setNoCheckout() {
this.noCheckout = true;
}
public List<Program> getOpenPrograms() {
return programList;
}
@ -189,10 +205,7 @@ public class OpenProgramTask extends Task {
private void openUnversionedFile(DomainFile domainFile) {
String filename = domainFile.getName();
monitor.setMessage("Opening " + filename);
if (!silent && domainFile.canCheckout() && domainFile.isInWritableProject()) {
checkout(domainFile);
}
performOptionalCheckout(domainFile);
try {
openFileMaybeUgrade(domainFile);
}
@ -260,15 +273,20 @@ public class OpenProgramTask extends Task {
return result.get();
}
private boolean checkout(DomainFile domainFile) {
User user = AppInfo.getActiveProject().getProjectData().getUser();
private void performOptionalCheckout(DomainFile domainFile) {
if (silent || noCheckout || !domainFile.canCheckout()) {
return;
}
User user = domainFile.getParent().getProjectData().getUser();
CheckoutDialog dialog = new CheckoutDialog(domainFile, user);
if (dialog.showDialog() == CheckoutDialog.CHECKOUT) {
try {
monitor.setMessage("Checking Out " + domainFile.getName());
if (domainFile.checkout(dialog.exclusiveCheckout(), monitor)) {
return true;
return;
}
Msg.showError(this, null, "Checkout Failed", "Exclusive checkout failed for: " +
domainFile.getName() + "\nOne or more users have file checked out!");
@ -283,7 +301,6 @@ public class OpenProgramTask extends Task {
Msg.showError(this, null, "Error on Check Out", e.getMessage(), e);
}
}
return false;
}
static class DomainFileInfo {