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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-02-19 11:28:28 -05:00
commit 85ed9774c0
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
View file

@ -2371,6 +2371,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
if (newStructure == null) { if (newStructure == null) {
// is a typeinfo that inherits a non class typeinfo so skip it // is a typeinfo that inherits a non class typeinfo so skip it
// or there was an issue creating it so skip it
continue; continue;
} }
@ -2741,6 +2742,12 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
int numBases; int numBases;
try { try {
numBases = api.getInt(typeinfoAddress.add(offsetOfNumBases)); numBases = api.getInt(typeinfoAddress.add(offsetOfNumBases));
if (numBases <= 0) {
Msg.debug(this, typeinfoAddress.toString() +
": VmiTypeinfoStructure has invalid number of bases: " + numBases);
return null;
}
} }
// if there isn't enough memory to get the int then return null // if there isn't enough memory to get the int then return null
catch (MemoryAccessException | AddressOutOfBoundsException e) { catch (MemoryAccessException | AddressOutOfBoundsException e) {