GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-11-27 03:13:43 +03:00
Code Issues Projects Releases Wiki Activity

[arm] Fail disassembly if readInstruction returns 0 bytes consumed

Browse Source 
Without this check this condition could cause the disassembly to
recurse until all system memory is exhausted.
This commit is contained in:
Kevin Quick 2018-03-26 16:05:34 -07:00
parent 80886bd73d
commit 9e0c325400
No known key found for this signature in database
GPG Key ID: E6D7733599CC0A21
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macaw-arm/src/Data/Macaw/ARM/Disassemble.hs
View File

@ -134,6 +134,7 @@ disassembleBlock lookupSemantics mem gs curPCAddr maxOffset = do
let off = MM.msegOffset curPCAddr
case readInstruction mem curPCAddr of
Left err -> failAt gs off curPCAddr (DecodeError err)
Right (_, 0) -> failAt gs off curPCAddr (InvalidNextPC curPCAddr curPCAddr)
Right (i, bytesRead) -> do
-- traceM ("II: " ++ show i)
let nextPCOffset = off + bytesRead