83b9a66 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Shared: Fixed bug in openURL with data: URIs.

83b9a66John MacFarlane13 years ago

src/Text/Pandoc/Shared.hs+2−1

@@ -108,6 +108,7 @@ import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),

108import qualified Data.ByteString as BS

109import qualified Data.ByteString.Char8 as B8

110import Text.Pandoc.Compat.Monoid

111+import Data.ByteString.Base64 (decodeLenient)

111

112

112#ifdef EMBED_DATA_FILES

113#ifdef EMBED_DATA_FILES

113import Text.Pandoc.Data (dataFiles)

114import Text.Pandoc.Data (dataFiles)

@@ -641,7 +642,7 @@ openURL u

641 | "data:" `isPrefixOf` u =

642 | "data:" `isPrefixOf` u =

642 let mime = takeWhile (/=',') $ drop 5 u

643 let mime = takeWhile (/=',') $ drop 5 u

643 contents = B8.pack $ unEscapeString $ drop 1 $ dropWhile (/=',') u

644 contents = B8.pack $ unEscapeString $ drop 1 $ dropWhile (/=',') u

644− in return $ Right (contents, Just mime)

645+ in return $ Right (decodeLenient contents, Just mime)

645#ifdef HTTP_CONDUIT

646#ifdef HTTP_CONDUIT

646 | otherwise = E.try $ do

647 | otherwise = E.try $ do

647 req <- parseUrl u

648 req <- parseUrl u