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

GP-3632 Corrected pointer and array replacement issues

Browse source
This commit is contained in:
ghidra1 2024-02-12 16:10:24 -05:00
parent 2d9a1ac539
commit b0b813edf9
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDB.java
View file

@ -282,7 +282,7 @@ class ArrayDB extends DataTypeDB implements Array {
new ArrayDataType(newDt, getNumElements(), newElementLength, dataMgr); new ArrayDataType(newDt, getNumElements(), newElementLength, dataMgr);
DataType existingArray = DataType existingArray =
dataMgr.getDataType(newDt.getCategoryPath(), newArray.getName()); dataMgr.getDataType(newDt.getCategoryPath(), newArray.getName());
if (existingArray != null) { if (existingArray != null && existingArray != this) {
// avoid duplicate array - replace this array with existing one // avoid duplicate array - replace this array with existing one
dataMgr.addDataTypeToReplace(this, existingArray); dataMgr.addDataTypeToReplace(this, existingArray);
return; return;

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/PointerDB.java
View file

@ -367,7 +367,7 @@ class PointerDB extends DataTypeDB implements Pointer {
hasLanguageDependantLength() ? -1 : getLength(), dataMgr); hasLanguageDependantLength() ? -1 : getLength(), dataMgr);
DataType existingPtr = DataType existingPtr =
dataMgr.getDataType(newDt.getCategoryPath(), newPtr.getName()); dataMgr.getDataType(newDt.getCategoryPath(), newPtr.getName());
if (existingPtr != null) { if (existingPtr != null && existingPtr != this) {
// avoid duplicate pointer - replace this pointer with existing one // avoid duplicate pointer - replace this pointer with existing one
dataMgr.addDataTypeToReplace(this, existingPtr); dataMgr.addDataTypeToReplace(this, existingPtr);
return; return;