Reset the lazy decoder state consistently if an error occurs

This fixes gh-87.
haskell · Sep 8, 2014 · 2925921 · 2925921
1 parent e661fd8
commit 2925921
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Data/Text/Encoding.hs b/Data/Text/Encoding.hs
@@ -267,14 +267,14 @@ streamDecodeUtf8With onErr = decodeChunk B.empty 0 0
                 UTF8_REJECT -> do
                   -- We encountered an encoding error
                   x <- peek curPtr'
+                  poke statePtr 0
                   case onErr desc (Just x) of
                     Nothing -> loop $ curPtr' `plusPtr` 1
                     Just c -> do
                       destOff <- peek destOffPtr
                       w <- unsafeSTToIO $
                            unsafeWrite dest (fromIntegral destOff) (safe c)
                       poke destOffPtr (destOff + fromIntegral w)
-                      poke statePtr 0
                       loop $ curPtr' `plusPtr` 1
 
                 _ -> do