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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-02-06 09:37:09 -05:00
commit c87707cc4e
9 changed files with 250 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
View file

@ -2323,14 +2323,7 @@ void ProtoModel::decode(Decoder &decoder)
if (attribId == ATTRIB_NAME)
name = decoder.readString();
else if (attribId == ATTRIB_EXTRAPOP) {
string extrapopString = decoder.readString();
if (extrapopString == "unknown")
extrapop = extrapop_unknown;
else {
istringstream s(extrapopString);
s.unsetf(ios::dec | ios::hex | ios::oct);
s >> extrapop;
}
extrapop = decoder.readSignedIntegerExpectString("unknown", extrapop_unknown);
}
else if (attribId == ATTRIB_STACKSHIFT) {
// Allow this attribute for backward compatibility
@ -4415,11 +4408,7 @@ void FuncProto::decode(Decoder &decoder,Architecture *glb)
}
else if (attribId == ATTRIB_EXTRAPOP) {
seenextrapop = true;
try {
readextrapop = decoder.readSignedInteger();
} catch(DecoderError &err) {
readextrapop = ProtoModel::extrapop_unknown;
}
readextrapop = decoder.readSignedIntegerExpectString("unknown", ProtoModel::extrapop_unknown);
}
else if (attribId == ATTRIB_MODELLOCK) {
if (decoder.readBool())