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

Merge remote-tracking branch 'origin/GT-2745_caheckman'

Browse source
This commit is contained in:
ghidravore 2019-04-16 14:50:37 -04:00
commit fddb09f2f3
6 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java
View file

@ -1111,7 +1111,9 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
}
else {
buildSortedDataTypeList();
Iterator<DataType> it = sortedDataTypes.iterator();
// make copy of sortedDataTypes list before iterating as dt.dataTypeReplaced may
// call back into this class and cause a modification to the sortedDataTypes list.
Iterator<DataType> it = new ArrayList<>(sortedDataTypes).iterator();
while (it.hasNext()) {
DataType dt = it.next();
dt.dataTypeReplaced(existingDt, newDt);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
View file

@ -118,8 +118,8 @@ public class DynamicHash {
reg = SimpleCRC32.hashOneByte(reg, slot);
reg = SimpleCRC32.hashOneByte(reg, transtable[op.getOpcode()]);
long val = op.getSeqnum().getTarget().getOffset();
int sz = op.getSeqnum().getTarget().getPointerSize();
for (int i = 0; i < sz; ++i) {
int sz = op.getSeqnum().getTarget().getSize();
for (int i = 0; i < sz; i += 8) {
reg = SimpleCRC32.hashOneByte(reg, (int) val);
val >>= 8;
}