Fix: file corruption on x32 systems (#378)

- fixed corruption of downloaded files on x32 architectures due to `segmentOffset` overflow and using `fseek` instead of `fseeko` function which can handle int64 width
nzbgetcom · Sep 10, 2024 · a59edac · a59edac
1 parent e7ffa5f
commit a59edac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/daemon/main/nzbget.h b/daemon/main/nzbget.h
@@ -356,6 +356,7 @@ typedef int pid_t;
 #define FOPEN_WB "wb"
 #define FOPEN_AB "ab"
 #define CHILD_WATCHDOG 1
+#define fseek fseeko
 
 #endif /* POSIX */
 

diff --git a/daemon/queue/DiskState.cpp b/daemon/queue/DiskState.cpp
@@ -1233,8 +1233,12 @@ bool DiskState::SaveFileState(FileInfo* fileInfo, StateDiskFile& outfile, bool c
 	outfile.PrintLine("%i", (int)fileInfo->GetArticles()->size());
 	for (ArticleInfo* articleInfo : fileInfo->GetArticles())
 	{
-		outfile.PrintLine("%i,%u,%i,%u", (int)articleInfo->GetStatus(), (uint32)articleInfo->GetSegmentOffset(),
-			articleInfo->GetSegmentSize(), (uint32)articleInfo->GetCrc());
+		outfile.PrintLine("%i,%" PRIi64 ",%i,%u", 
+			(int)articleInfo->GetStatus(), 
+			articleInfo->GetSegmentOffset(),
+			articleInfo->GetSegmentSize(), 
+			articleInfo->GetCrc()
+		);
 	}
 
 	outfile.Close();
@@ -1313,9 +1317,10 @@ bool DiskState::LoadFileState(FileInfo* fileInfo, Servers* servers, StateDiskFil
 
 		if (formatVersion >= 2)
 		{
-			uint32 segmentOffset, crc;
+			int64 segmentOffset;
+			uint32 crc;
 			int segmentSize;
-			if (infile.ScanLine("%i,%u,%i,%u", &statusInt, &segmentOffset, &segmentSize, &crc) != 4) goto error;
+			if (infile.ScanLine("%i,%" PRIi64 ",%i,%u", &statusInt, &segmentOffset, &segmentSize, &crc) != 4) goto error;
 			pa->SetSegmentOffset(segmentOffset);
 			pa->SetSegmentSize(segmentSize);
 			pa->SetCrc(crc);