Test InvalidIndex and InvalidSize exceptions

2 files changed, 5 insertions, 2 deletions

diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs
index 453c0d4f..a4b55b3d 100644
--- a/src/Data/Torrent/Layout.hs
+++ b/src/Data/Torrent/Layout.hs
@@ -56,6 +56,7 @@ module Data.Torrent.Layout
        , fileOffset
 
          -- * Internal
+       , sizeInBase
        , getLayoutInfo
        , putLayoutInfo
        ) where
diff --git a/src/System/Torrent/Storage.hs b/src/System/Torrent/Storage.hs
index bf44d7bf..8ad4d3e5 100644
--- a/src/System/Torrent/Storage.hs
+++ b/src/System/Torrent/Storage.hs
@@ -45,7 +45,7 @@ import Data.Typeable
 import Data.Torrent.Bitfield
 import Data.Torrent.Layout
 import Data.Torrent.Piece
-import System.Torrent.FileMap
+import System.Torrent.FileMap as FM
 
 
 data StorageFailure
@@ -82,7 +82,9 @@ withStorage :: Mode -> PieceSize -> FileLayout FileSize
 withStorage m s l = bracket (open m s l) close
 
 isValidIx :: PieceIx -> Storage -> Bool
-isValidIx i s = 0 <= i && i < undefined s
+isValidIx i Storage {..} = 0 <= i && i < pcount
+  where
+    pcount = FM.size fileMap `sizeInBase` pieceLen
 
 writePiece :: Piece BL.ByteString -> Storage -> IO ()
 writePiece p @ Piece {..} s @ Storage {..}