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

GP-0: Guard the buffer truncation with Reason.EXECUTE_DECODE

Browse source
This commit is contained in:
Dan 2023-04-03 09:33:55 -04:00
parent 88d0110a09
commit deaa24a496
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/BytesPcodeExecutorStateSpace.java
View file

@ -185,12 +185,18 @@ public class BytesPcodeExecutorStateSpace<B> {
}
}
Iterator<ULongSpan> it =
uninitialized.complement(ULongSpan.extent(offset, size)).iterator();
if (it.hasNext()) {
ULongSpan init = it.next();
if (init.min().longValue() == offset) {
return readBytes(offset, (int) init.length(), reason);
/**
* The decoder will buffer ahead, so give it as much as we can, but no more than is actually
* initialized. If it's a (non-decode) read, give it everything, but invoke the warning.
*/
if (reason == Reason.EXECUTE_DECODE) {
Iterator<ULongSpan> it =
uninitialized.complement(ULongSpan.extent(offset, size)).iterator();
if (it.hasNext()) {
ULongSpan init = it.next();
if (init.min().longValue() == offset) {
return readBytes(offset, (int) init.length(), reason);
}
}
}