Skip to content

Commit 5fc9acc

Browse files
committed
Redesign security checks to use SomeException
1 parent a0c7c6f commit 5fc9acc

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Codec/Archive/Tar/Check/Internal.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@ instance Show PortabilityError where
291291
--------------------------
292292
-- Utils
293293

294-
checkEntries :: (GenEntry a b -> Maybe e') -> GenEntries a b e -> GenEntries a b (Either e e')
294+
checkEntries
295+
:: (GenEntry tarPath linkTarget -> Maybe e')
296+
-> GenEntries tarPath linkTarget e
297+
-> GenEntries tarPath linkTarget (Either e e')
295298
checkEntries checkEntry =
296299
mapEntries (\entry -> maybe (Right entry) Left (checkEntry entry))

changelog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See also http://pvp.haskell.org/faq
99
* Handle > 8 GB files
1010
* Prohibit non-ASCII file names instead of silent corruption
1111
* Fix tests on 32-bit architectures
12-
* Do not leak file handles in `packFileEntry`
12+
* Alleviate leakage of file handles in `packFileEntry`
1313
* Add support for over-long filepaths via GNU extension
1414
* Add `toTarPath'`, `ToTarPathResult`, `longLinkEntry`, `longSymLinkEntry`
1515
* Fix handling of hardlinks and symlinks
@@ -18,7 +18,7 @@ See also http://pvp.haskell.org/faq
1818
* Switch to trailer parsing mode only after a full block of `NUL`
1919
* Drop deprecated `emptyIndex` and `finaliseIndex`
2020
* Extend `FileNameError` with `UnsafeLinkTarget` constructor
21-
* Add `packAndCheck` and `unpackAndCheck`
21+
* Add `packAndCheck`, `unpackAndCheck` and `Entry`-wise checks
2222
* Generalize `Entries`, `Entry` and `EntryContent` to `GenEntries`, `GenEntry` and `GenEntryContent`
2323

2424
0.5.1.1 Herbert Valerio Riedel <[email protected]> August 2019

0 commit comments

Comments
 (0)