Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use splitDirectories istead of splitPath.

Browse source 
We were using `splitPath` in two places in the code
where `splitDirectories` should have been used.

This led to a test for `..` in paths in `extractMedia`
failing, so that images with `..` in the path name
could be extracted outside the directory specified
by `extractMedia`.

It also led a test for `media` in resource paths to fail
in the docx reader.
This commit is contained in:
John MacFarlane 2021-12-28 16:31:54 -08:00
parent 7d56650e01
commit d960282b10
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Text/Pandoc/MediaBag.hs
View file

@ -80,7 +80,7 @@ insertMedia fp mbMime contents (MediaBag mediamap) =
uri = parseURI fp uri = parseURI fp
newpath = if isRelative fp newpath = if isRelative fp
&& isNothing uri && isNothing uri
&& ".." `notElem` splitPath fp && ".." `notElem` splitDirectories fp
then T.unpack fp' then T.unpack fp'
else showDigest (sha1 contents) <> "." <> ext else showDigest (sha1 contents) <> "." <> ext
fallback = case takeExtension fp of fallback = case takeExtension fp of

2
src/Text/Pandoc/Readers/Docx/Parse.hs
View file

@ -505,7 +505,7 @@ archiveToRelationships archive docXmlPath =
filePathIsMedia :: FilePath -> Bool filePathIsMedia :: FilePath -> Bool
filePathIsMedia fp = filePathIsMedia fp =
"media" `elem` splitPath (takeDirectory fp) "media" `elem` splitDirectories (takeDirectory fp)
lookupLevel :: T.Text -> T.Text -> Numbering -> Maybe Level lookupLevel :: T.Text -> T.Text -> Numbering -> Maybe Level
lookupLevel numId ilvl (Numbering _ numbs absNumbs) = do lookupLevel numId ilvl (Numbering _ numbs absNumbs) = do