update with bug fix

base64.cabal

@@ -53,9 +53,9 @@ library
     Data.ByteString.Base64.Internal.W64.Loop
 
   build-depends:
-      base           >=4.14     && <4.19
+      base           >=4.14   && <4.19
     , bytestring     ^>=0.11
-    , deepseq        >=1.4.8.0  && <1.5
+    , deepseq        >=1.4.4  && <1.5
     , text           ^>=2.0
     , text-short     ^>=0.1
 

benchmarks/Base64Bench.hs

@@ -56,27 +56,33 @@ main =
       bgroup "decode"
       [ bgroup "25"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs25)
-        , bench "base64" $ whnf B64.decodeBase64 bs25
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs25
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs25)
         ]
       , bgroup "100"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs100)
-        , bench "base64" $ whnf B64.decodeBase64 bs100
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs100
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs100)
         ]
       , bgroup "1k"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs1k)
-        , bench "base64" $ whnf B64.decodeBase64 bs1k
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs1k
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs1k)
         ]
       , bgroup "10k"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs10k)
-        , bench "base64" $ whnf B64.decodeBase64 bs10k
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs10k
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs10k)
         ]
       , bgroup "100k"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs100k)
-        , bench "base64" $ whnf B64.decodeBase64 bs100k
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs100k
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs100k)
         ]
       , bgroup "1mm"
         [ bench "base64-bytestring" $ whnf Bos.decode (B64.extractBase64 bs1mm)
-        , bench "base64" $ whnf B64.decodeBase64 bs1mm
+        , bench "base64-typed" $ whnf B64.decodeBase64 bs1mm
+        , bench "base64-untyped" $ whnf B64.decodeBase64Untyped (B64.extractBase64 bs1mm)
         ]
       ]
     ]

src/Data/ByteString/Base64/Internal/W64/Loop.hs

@@ -45,7 +45,7 @@ innerLoop
 innerLoop !etable !sptr !dptr !end finish = go sptr dptr
   where
     go !src !dst
-      | plusPtr src 5 >= end =
+      | plusPtr src 7 >= end =
         W16.innerLoop etable (castPtr src) (castPtr dst) (castPtr end) finish
       | otherwise = do
         !t <- peekWord64BE src

test/Main.hs

@@ -387,29 +387,29 @@ offsetVectors :: (IsString a, Eq a, Show a) => Harness a -> TestTree
 offsetVectors Harness{..} = testGroup "Offset tests"
   [ testGroup "Invalid padding"
     [ testCase "Invalid staggered padding" $ do
-      decodeUrl "=A==" @=? Left "invalid padding at offset: 0"
-      decodeUrl "P===" @=? Left "invalid padding at offset: 1"
+      decodeUrl "=A==" @=? Left "invalid padding near offset: 0"
+      decodeUrl "P===" @=? Left "invalid padding near offset: 1"
     , testCase "Invalid character coverage - final chunk" $ do
-      decodeUrl "%D==" @=? Left "invalid character at offset: 0"
-      decodeUrl "P%==" @=? Left "invalid character at offset: 1"
-      decodeUrl "PD%=" @=? Left "invalid character at offset: 2"
-      decodeUrl "PA=%" @=? Left "invalid character at offset: 3"
-      decodeUrl "PDw%" @=? Left "invalid character at offset: 3"
+      decodeUrl "%D==" @=? Left "invalid base64 encoding near offset: 0"
+      decodeUrl "P%==" @=? Left "invalid base64 encoding near offset: 1"
+      decodeUrl "PD%=" @=? Left "invalid base64 encoding near offset: 2"
+      decodeUrl "PA=%" @=? Left "invalid base64 encoding near offset: 3"
+      decodeUrl "PDw%" @=? Left "invalid base64 encoding near offset: 3"
     , testCase "Invalid character coverage - decode chunk" $ do
-      decodeUrl "%Dw_PDw_" @=? Left "invalid character at offset: 0"
-      decodeUrl "P%w_PDw_" @=? Left "invalid character at offset: 1"
-      decodeUrl "PD%_PDw_" @=? Left "invalid character at offset: 2"
-      decodeUrl "PDw%PDw_" @=? Left "invalid character at offset: 3"
+      decodeUrl "%Dw_PDw_" @=? Left "invalid base64 encoding near offset: 0"
+      decodeUrl "P%w_PDw_" @=? Left "invalid base64 encoding near offset: 1"
+      decodeUrl "PD%_PDw_" @=? Left "invalid base64 encoding near offset: 2"
+      decodeUrl "PDw%PDw_" @=? Left "invalid base64 encoding near offset: 3"
     , testCase "Invalid padding in body" $ do
-      decodeUrl "PD=_PDw_" @=? Left "invalid padding at offset: 2"
-      decodeUrl "PDw=PDw_" @=? Left "invalid padding at offset: 3"
+      decodeUrl "PD=_PDw_" @=? Left "invalid padding near offset: 2"
+      decodeUrl "PDw=PDw_" @=? Left "invalid padding near offset: 3"
     , testCase "Padding fails everywhere but end" $ do
-      decode "=eAoeAo=" @=? Left "invalid padding at offset: 0"
-      decode "e=AoeAo=" @=? Left "invalid padding at offset: 1"
-      decode "eA=oeAo=" @=? Left "invalid padding at offset: 2"
-      decode "eAo=eAo=" @=? Left "invalid padding at offset: 3"
-      decode "eAoe=Ao=" @=? Left "invalid padding at offset: 4"
-      decode "eAoeA=o=" @=? Left "invalid padding at offset: 5"
+      decode "=eAoeAo=" @=? Left "invalid padding near offset: 0"
+      decode "e=AoeAo=" @=? Left "invalid padding near offset: 1"
+      decode "eA=oeAo=" @=? Left "invalid padding near offset: 2"
+      decode "eAo=eAo=" @=? Left "invalid padding near offset: 3"
+      decode "eAoe=Ao=" @=? Left "invalid padding near offset: 4"
+      decode "eAoeA=o=" @=? Left "invalid padding near offset: 5"
     ]
   ]