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

Merge remote-tracking branch 'origin/GP-698_ghizard_fix_GP-611_ANALYZED_fallout'

Browse Source
This commit is contained in:
ghidra1
2021-02-23 17:04:15 -05:00
parent c446d32102 90dd0e6dd5
commit 98d0cd9034
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java
View File

@@ -1110,7 +1110,14 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl
int answer = OptionDialog.showYesNoDialog(tool.getToolFrame(), "Analyze", int answer = OptionDialog.showYesNoDialog(tool.getToolFrame(), "Analyze",
"<html>" + HTMLUtilities.escapeHTML(program.getDomainFile().getName()) + "<html>" + HTMLUtilities.escapeHTML(program.getDomainFile().getName()) +
" has not been analyzed. Would you like to analyze it now?"); " has not been analyzed. Would you like to analyze it now?");
return answer == OptionDialog.OPTION_ONE; // Analyze //Set to false for now. ANALYZED is a tri-valued variable:
// null means not asked.
// false means asked but could still turn true when analysis happens.
// true means analysis has started.
//Setting false here only works due to this code only being reachable
// because of the behavior of GhidraProgramUtilities.shouldAskToAnalyze(program) above.
GhidraProgramUtilities.setAnalyzedFlag(program, false);
return answer == OptionDialog.OPTION_ONE; //Analyze
} }
return false; return false;
} }

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java
View File

@@ -190,10 +190,12 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis
if (!showOptionsDialog(program)) { if (!showOptionsDialog(program)) {
return; return;
} }
GhidraProgramUtilities.setAnalyzedFlag(program, true);
analysisMgr.initializeOptions(); // options may have changed analysisMgr.initializeOptions(); // options may have changed
// At this point, any analysis that is done is consider to be true for analyzed.
GhidraProgramUtilities.setAnalyzedFlag(program, true);
// start analysis to set the flag, but it probably won't do more. A bit goofy but better // start analysis to set the flag, but it probably won't do more. A bit goofy but better
// than the way it was // than the way it was
//TODO simplify all this after creating a taskManager per program instead of per tool. //TODO simplify all this after creating a taskManager per program instead of per tool.