yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4125_ghidra1_ArtificialBlockAttribute--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2024-03-07 08:50:41 -05:00
commit c3c34ebf10
48 changed files with 734 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/validator/MemoryBlocksValidator.java
View file

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -69,13 +68,13 @@ public class MemoryBlocksValidator extends VTPreconditionValidator {
sourceProgram.getMemory().getBlock(destBlocks[i].getName());
if (matchingABlock != null) {
numMatchingNames++;
int sourcePerm = matchingABlock.getPermissions();
if (sourcePerm == destBlocks[i].getPermissions()) {
int sourceFlags = matchingABlock.getFlags();
if (sourceFlags == destBlocks[i].getFlags()) {
numMatches++;
}
else {
warnings.append("Block " + destProgName + ":" + blockName +
" doesn't match permissions of " + sourceProgName + ":" + blockName + "\n");
" has different flags than " + sourceProgName + ":" + blockName + "\n");
status = ConditionStatus.Warning;
}
}
@ -102,10 +101,12 @@ public class MemoryBlocksValidator extends VTPreconditionValidator {
}
}
if (numMatchingNames == numBlocksNeededForPerfectMatch) {
warnings.append("\nSUMMARY: Number and names of blocks match but not all permissions match.");
warnings.append(
"\nSUMMARY: Number and names of blocks match but not all permissions match.");
}
else {
warnings.append("\nSUMMARY: Number, names, and permissions of blocks do not all match");
warnings.append(
"\nSUMMARY: Number, names, and permissions of blocks do not all match");
}
}
return new ConditionResult(status, warnings.toString());