From: Joey Hess Date: Tue, 8 Dec 2020 16:51:56 +0000 (-0400) Subject: avoid parseDuration succeeding on empty string X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~76^2~393^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=794fc72afbaab7b49faafc158fe5a064bdb2eb49;p=git-annex.git avoid parseDuration succeeding on empty string --- diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs index 7db1008015..5178531cf8 100644 --- a/Utility/HumanTime.hs +++ b/Utility/HumanTime.hs @@ -45,7 +45,9 @@ daysToDuration i = Duration $ i * dsecs {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -} parseDuration :: String -> Either String Duration -parseDuration d = maybe parsefail (Right . Duration) $ go 0 d +parseDuration d + | null d = parsefail + | otherwise = maybe parsefail (Right . Duration) $ go 0 d where go n [] = return n go n s = do