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

GP-2246 Fix broken SegmentOp marshaling

Browse source
This commit is contained in:
caheckman 2022-06-28 12:31:52 -04:00
parent bdf3ce0c22
commit 89b8a59e99
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Decompiler/src/decompile/cpp/inject_ghidra.cc
View file

@ -142,9 +142,9 @@ void ExecutablePcodeGhidra::decode(Decoder &decoder)
{ {
uint4 elemId = decoder.openElement(); uint4 elemId = decoder.openElement();
if (elemId != ELEM_CASE_PCODE && elemId != ELEM_ADDR_PCODE && if (elemId != ELEM_PCODE && elemId != ELEM_CASE_PCODE && elemId != ELEM_ADDR_PCODE &&
elemId != ELEM_DEFAULT_PCODE && elemId != ELEM_SIZE_PCODE) elemId != ELEM_DEFAULT_PCODE && elemId != ELEM_SIZE_PCODE)
throw XmlError("Expecting <case_pcode>, <addr_pcode>, <default_pcode>, or <size_pcode>"); throw XmlError("Expecting <pcode>, <case_pcode>, <addr_pcode>, <default_pcode>, or <size_pcode>");
decodePayloadAttributes(decoder); decodePayloadAttributes(decoder);
decodePayloadParams(decoder); // Parse the parameters decodePayloadParams(decoder); // Parse the parameters
decoder.closeElementSkipping(elemId); // But skip rest of body decoder.closeElementSkipping(elemId); // But skip rest of body

5
Ghidra/Features/Decompiler/src/decompile/cpp/inject_sleigh.cc
View file

@ -231,8 +231,9 @@ void ExecutablePcodeSleigh::decode(Decoder &decoder)
{ {
uint4 elemId = decoder.openElement(); uint4 elemId = decoder.openElement();
if (elemId != ELEM_CASE_PCODE && elemId != ELEM_ADDR_PCODE && elemId != ELEM_DEFAULT_PCODE && elemId != ELEM_SIZE_PCODE) if (elemId != ELEM_PCODE && elemId != ELEM_CASE_PCODE &&
throw XmlError("Expecting <case_pcode>, <addr_pcode>, <default_pcode>, or <size_pcode>"); elemId != ELEM_ADDR_PCODE && elemId != ELEM_DEFAULT_PCODE && elemId != ELEM_SIZE_PCODE)
throw XmlError("Expecting <pcode>, <case_pcode>, <addr_pcode>, <default_pcode>, or <size_pcode>");
decodePayloadAttributes(decoder); decodePayloadAttributes(decoder);
decodePayloadParams(decoder); decodePayloadParams(decoder);
uint4 subId = decoder.openElement(ELEM_BODY); uint4 subId = decoder.openElement(ELEM_BODY);