Merge branch 'GT-2736_ghidravore_concurrent_modification_in_dtm' into Ghidra_9.0.3

This commit is contained in:
ghidravore 2019-04-04 16:00:07 -04:00
commit 1dcba64533

View File

@ -1111,7 +1111,9 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
} }
else { else {
buildSortedDataTypeList(); 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()) { while (it.hasNext()) {
DataType dt = it.next(); DataType dt = it.next();
dt.dataTypeReplaced(existingDt, newDt); dt.dataTypeReplaced(existingDt, newDt);