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

fix segment equality check

Browse Source
This commit is contained in:
Daniel Wagner 2018-01-26 10:17:17 -08:00
parent dfa21bc40a
commit fbe716607f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/src/Data/Macaw/Discovery.hs
View File

@ -304,11 +304,12 @@ addFunBlock ::
FunState arch s ids
addFunBlock segment block s = case Map.lookupLT segment (s ^. curFunBlocks) of
Just (bSegment, bBlock)
-- if we're in the same segment
| msegSegment bSegment == msegSegment segment
-- and the blocks overlap
&& msegOffset bSegment + blockSize bBlock >= msegOffset segment
-- then put the overlapped segment back in the frontier
-- very sneaky way to check that they are in the same segment (a
-- Nothing result from diffSegmentOff will never be greater than a
-- Just) and that they are overlapping (the block size is bigger than
-- you'd expect given the address difference)
| diffSegmentOff bSegment segment > Just (-toInteger (blockSize bBlock))
-- put the overlapped segment back in the frontier
-> s & curFunBlocks %~ (Map.insert segment block . Map.delete bSegment)
& foundAddrs.at bSegment._Just.foundReasonL %~ SplitAt segment
& frontier %~ Set.insert bSegment