From 21f4597dade9e55d059bfdca4cd12096fdd1cf88 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Fri, 1 May 2026 13:32:19 +0100 Subject: [PATCH] xftp: backwards compatible file header decoding (#1768) --- src/Simplex/FileTransfer/Types.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Simplex/FileTransfer/Types.hs b/src/Simplex/FileTransfer/Types.hs index 86ecdc5d5..ff70b8f13 100644 --- a/src/Simplex/FileTransfer/Types.hs +++ b/src/Simplex/FileTransfer/Types.hs @@ -46,6 +46,7 @@ import Simplex.Messaging.Encoding import Simplex.Messaging.Encoding.String import Simplex.Messaging.Parsers import Simplex.Messaging.Protocol (XFTPServer) +import Simplex.Messaging.Util (safeDecodeUtf8, (<$$>)) import System.FilePath (()) type RcvFileId = ByteString -- Agent entity ID @@ -65,7 +66,8 @@ data FileHeader = FileHeader instance Encoding FileHeader where smpEncode FileHeader {fileName, fileExtra} = smpEncode (fileName, fileExtra) smpP = do - (fileName, fileExtra) <- smpP + fileName <- safeDecodeUtf8 <$> smpP + fileExtra <- safeDecodeUtf8 <$$> smpP pure FileHeader {fileName, fileExtra} type DBRcvFileId = Int64