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

Corrected issue with Program metadata which included CustomerOption.

Browse source 
Cleanup PDB analyzer related error reporting.
This commit is contained in:
ghidra1 2020-10-08 12:44:41 -04:00
parent 4295690e0b
commit 3cd26120a3
13 changed files with 240 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
View file

@ -540,18 +540,18 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB
Options propList = getOptions(Program.PROGRAM_INFO);
List<String> propNames = propList.getOptionNames();
Collections.sort(propNames);
for (String name : propNames) {
metadata.put(name, propList.getValueAsString(name));
for (String propName : propNames) {
if (propName.indexOf(Options.DELIMITER) >= 0) {
continue; // ignore second tier options
}
String valueAsString = propList.getValueAsString(propName);
if (valueAsString != null) {
metadata.put(propName, propList.getValueAsString(propName));
}
}
return metadata;
}
// private static String getString(Object obj) {
// if (obj != null) {
// return obj.toString();
// }
// return null;
// }
@Override
protected void updateMetadata() throws IOException {
getMetadata(); // updates metadata map

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java
View file

@ -2360,7 +2360,13 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
List<String> propNames = propList.getOptionNames();
Collections.sort(propNames);
for (String propName : propNames) {
metadata.put(propName, propList.getValueAsString(propName));
if (propName.indexOf(Options.DELIMITER) >= 0) {
continue; // ignore second tier options
}
String valueAsString = propList.getValueAsString(propName);
if (valueAsString != null) {
metadata.put(propName, propList.getValueAsString(propName));
}
}
return metadata;
}