mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-22 18:22:23 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-11-08 10:57:38 -05:00
parent 8cb1259bd6 6b734cba46
commit dae07c1900
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
View File

@@ -3083,7 +3083,7 @@ Datatype *TypeFactory::findAdd(Datatype &ct)
if (ct.name.size()!=0) { // If there is a name
if (ct.id == 0) // There must be an id
throw LowlevelError("Datatype must have a valid id");
throw LowlevelError("Datatype must have a valid id: "+ct.name);
res = findByIdLocal(ct.name,ct.id); // Lookup type by it
if (res != (Datatype *)0) { // If a type has this name
if (0!=res->compareDependency( ct )) // Check if it is the same type

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java
View File

@@ -1215,7 +1215,7 @@ public class PcodeDataTypeManager {
}
/**
* Encode the coretypes to the stream
* Encode the core data-types to the stream
* @param encoder is the stream encoder
* @throws IOException for errors in the underlying stream
*/
@@ -1233,8 +1233,7 @@ public class PcodeDataTypeManager {
if (typeMap.isUtf) {
encoder.writeBool(ATTRIB_UTF, true);
}
// Encode special id ( <0 for builtins )
encoder.writeSignedInteger(ATTRIB_ID, typeMap.id);
encoder.writeUnsignedInteger(ATTRIB_ID, typeMap.id);
encoder.closeElement(ELEM_TYPE);
}
encoder.closeElement(ELEM_CORETYPES);