From 3f9221420a57b0b7534a0877925e363855274b1a Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <git@r.bdr.sh>
Date: Wed, 5 Feb 2025 15:06:22 +0100
Subject: Account for 16 vs 32 bit integers in folder upload

---
 hotline/server.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'hotline')

diff --git a/hotline/server.go b/hotline/server.go
index ed3c041..a521a6b 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -603,10 +603,20 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 			s.Stats.Decrement(StatUploadsInProgress)
 		}()
 
+		var transferSizeValue uint32
+		switch len(fileTransfer.TransferSize) {
+			case 2: // 16-bit
+				transferSizeValue = uint32(binary.BigEndian.Uint16(fileTransfer.TransferSize))
+			case 4: // 32-bit
+				transferSizeValue = binary.BigEndian.Uint32(fileTransfer.TransferSize)
+			default:
+				rLogger.Warn("Unexpected TransferSize length: %d bytes", len(fileTransfer.TransferSize))
+		}
+
 		rLogger.Info(
 			"Folder upload started",
 			"dstPath", fullPath,
-			"TransferSize", binary.BigEndian.Uint32(fileTransfer.TransferSize),
+			"TransferSize", transferSizeValue,
 			"FolderItemCount", fileTransfer.FolderItemCount,
 		)
 
-- 
cgit