Improve SHA*E extension extraction code.

Filter out over-long "extensions" before stripping out non-alphanumerics
from them, so that eg "foo.ba__________r" is not considered a .bar
extension.

1 files changed, 3 insertions, 2 deletions

diff --git a/Backend/Hash.hs b/Backend/Hash.hs
index fd51d87ce..ba8d4bc64 100644
--- a/Backend/Hash.hs
+++ b/Backend/Hash.hs
@@ -101,8 +101,9 @@ selectExtension f
 	| otherwise = intercalate "." ("":es)
   where
 	es = filter (not . null) $ reverse $
-		take 2 $ takeWhile shortenough $
-		reverse $ split "." $ filter validInExtension $ takeExtensions f
+		take 2 $ map (filter validInExtension) $
+		takeWhile shortenough $
+		reverse $ split "." $ takeExtensions f
 	shortenough e = length e <= 4 -- long enough for "jpeg"
 
 {- A key's checksum is checked during fsck. -}