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

GP-3186 Add 0 size exports to consistency check for subtables

Browse source
This commit is contained in:
caheckman 2023-03-13 14:30:34 -04:00
parent d84d6df8f6
commit 349b891165
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
View file

@ -1004,7 +1004,7 @@ bool ConsistencyChecker::checkSectionTruncations(Constructor *ct,ConstructTpl *c
bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym) bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym)
{ {
int4 tablesize = 0; int4 tablesize = -1;
int4 numconstruct = sym->getNumConstructors(); int4 numconstruct = sym->getNumConstructors();
Constructor *ct; Constructor *ct;
bool testresult = true; bool testresult = true;
@ -1033,9 +1033,9 @@ bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym)
} }
seennonemptyexport = true; seennonemptyexport = true;
int4 exsize = recoverSize(exportres->getSize(),ct); int4 exsize = recoverSize(exportres->getSize(),ct);
if (tablesize == 0) if (tablesize == -1)
tablesize = exsize; tablesize = exsize;
if ((exsize!=0)&&(exsize != tablesize)) { if (exsize != tablesize) {
ostringstream msg; ostringstream msg;
msg << "Table '" << sym->getName() << "' has inconsistent export size; "; msg << "Table '" << sym->getName() << "' has inconsistent export size; ";
msg << "Constructor starting at line " << dec << ct->getLineno() << " is first conflict"; msg << "Constructor starting at line " << dec << ct->getLineno() << " is first conflict";

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/ConsistencyChecker.java
View file

@ -725,7 +725,7 @@ class ConsistencyChecker {
} }
private boolean checkSubtable(SubtableSymbol sym) { private boolean checkSubtable(SubtableSymbol sym) {
int tablesize = 0; int tablesize = -1;
int numconstruct = sym.getNumConstructors(); int numconstruct = sym.getNumConstructors();
Constructor ct; Constructor ct;
boolean testresult = true; boolean testresult = true;
@ -757,10 +757,10 @@ class ConsistencyChecker {
} }
seennonemptyexport = true; seennonemptyexport = true;
int exsize = recoverSize(exportres.getSize(), ct); int exsize = recoverSize(exportres.getSize(), ct);
if (tablesize == 0) { if (tablesize == -1) {
tablesize = exsize; tablesize = exsize;
} }
if ((exsize != 0) && (exsize != tablesize)) { if (exsize != tablesize) {
compiler.reportError(ct.location, String.format( compiler.reportError(ct.location, String.format(
"Table '%s' has inconsistent export size; Constructor at %s is first conflict", "Table '%s' has inconsistent export size; Constructor at %s is first conflict",
sym.getName(), ct.location)); sym.getName(), ct.location));