Skip to content

Check 'fromDistinctAscList' invariants when deserializing containers #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check 'fromDistinctAscList' invariants when deserializing containers #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 40 additions & 8 deletions src/Data/Binary/Class.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,22 +638,54 @@ instance Binary BS.ShortByteString where
------------------------------------------------------------------------
-- Maps and Sets

instance (Binary a) => Binary (Set.Set a) where
instance (Ord a, Binary a) => Binary (Set.Set a) where
put s = put (Set.size s) <> mapM_ put (Set.toAscList s)
get = liftM Set.fromDistinctAscList get

instance (Binary k, Binary e) => Binary (Map.Map k e) where
get = do ascList <- get
case ascList of
[] -> pure Set.empty
x:xs -> do guardAsc x xs
pure (Set.fromDistinctAscList ascList)
where guardAsc _ [] = pure ()
guardAsc x (y:xs)
| x < y = guardAsc y xs
| otherwise = fail "Set values are not ascending!"

instance (Ord k, Binary k, Binary e) => Binary (Map.Map k e) where
put m = put (Map.size m) <> mapM_ put (Map.toAscList m)
get = liftM Map.fromDistinctAscList get
get = do ascList <- get
case ascList of
[] -> pure Map.empty
(k,_):kvs -> do guardAsc k kvs
pure (Map.fromDistinctAscList ascList)
where guardAsc _ [] = pure ()
guardAsc k ((j,_):kvs)
| k < j = guardAsc j kvs
| otherwise = fail "Map keys are not ascending!"

instance Binary IntSet.IntSet where
put s = put (IntSet.size s) <> mapM_ put (IntSet.toAscList s)
get = liftM IntSet.fromDistinctAscList get
get = do ascList <- get
case ascList of
[] -> pure IntSet.empty
i:is -> do guardAsc i is
pure (IntSet.fromDistinctAscList ascList)
where guardAsc _ [] = pure ()
guardAsc i (j:is)
| i < j = guardAsc j is
| otherwise = fail "IntSet values are not ascending!"

instance (Binary e) => Binary (IntMap.IntMap e) where
put m = put (IntMap.size m) <> mapM_ put (IntMap.toAscList m)
get = liftM IntMap.fromDistinctAscList get

get = do ascList <- get
case ascList of
[] -> pure IntMap.empty
(i,_):ivs -> do guardAsc i ivs
pure (IntMap.fromDistinctAscList ascList)
where guardAsc _ [] = pure ()
guardAsc i ((j,_):ivs)
| i < j = guardAsc j ivs
| otherwise = fail "IntMap keys are not ascending!"

------------------------------------------------------------------------
-- Queues and Sequences

Expand Down