Skip to content

Fix decodeUtf8 #23

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

Fix decodeUtf8 #23

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
12 changes: 10 additions & 2 deletions Data/Bson/Binary.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ putCString x = do
putWord8 0

getCString :: Get Text
getCString = TE.decodeUtf8 . SC.concat . LC.toChunks <$> getLazyByteStringNul
getCString = do
b <- SC.concat . LC.toChunks <$> getLazyByteStringNul
case TE.decodeUtf8' b of
Left err ->
fail $ "Data.Bson.Binary.getCString: decodeUtf8 failed: " ++ show err
Right x -> return x

putString :: Text -> Put
putString x = let b = TE.encodeUtf8 x in do
Expand All @@ -152,7 +157,10 @@ getString = do
len <- subtract 1 <$> getInt32
b <- getByteString (fromIntegral len)
getWord8
return $ TE.decodeUtf8 b
case TE.decodeUtf8' b of
Left err ->
fail $ "Data.Bson.Binary.getString: decodeUtf8 failed: " ++ show err
Right x -> return x

putDocument :: Document -> Put
putDocument es = let b = runPut (mapM_ putField es) in do
Expand Down