From ce5bb26ef6db537e38679c8b0e9beeb64bbf03c5 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Mon, 6 Jul 2015 19:37:24 +0300
Subject: [PATCH] maybeDecompress: bail on all errors at the beginning of the
stream with zlib < 0.6
---
cabal-install/Distribution/Client/GZipUtils.hs | 2 +-
cabal-install/tests/UnitTests/Distribution/Client/GZipUtils.hs | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/cabal-install/Distribution/Client/GZipUtils.hs b/cabal-install/Distribution/Client/GZipUtils.hs
index f5d688faf5..181dde3d75 100644
--- a/cabal-install/Distribution/Client/GZipUtils.hs
+++ b/cabal-install/Distribution/Client/GZipUtils.hs
@@ -77,7 +77,7 @@ maybeDecompress bytes = foldStream $ decompressWithErrors gzipOrZlibFormat defau
-- Returning it as-is.
-- TODO: alternatively, we might consider looking for the two magic bytes
-- at the beginning of the gzip header.
- foldStream (StreamError DataError _) = bytes
+ foldStream (StreamError _ _) = bytes
foldStream somethingElse = doFold somethingElse
doFold StreamEnd = BS.Empty
diff --git a/cabal-install/tests/UnitTests/Distribution/Client/GZipUtils.hs b/cabal-install/tests/UnitTests/Distribution/Client/GZipUtils.hs
index 00beb1d252..19808233db 100644
--- a/cabal-install/tests/UnitTests/Distribution/Client/GZipUtils.hs
+++ b/cabal-install/tests/UnitTests/Distribution/Client/GZipUtils.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
module UnitTests.Distribution.Client.GZipUtils (
tests
) where
@@ -21,9 +20,7 @@ import Test.Tasty.QuickCheck
tests :: [TestTree]
tests = [ testCase "maybeDecompress" maybeDecompressUnitTest
-#if MIN_VERSION_zlib(0,6,0)
, testProperty "decompress plain" prop_maybeDecompress_plain
-#endif
, testProperty "decompress zlib" prop_maybeDecompress_zlib
, testProperty "decompress gzip" prop_maybeDecompress_gzip
]
--
GitLab