#407: fixed: rar-rename may fail to read encrypted rar3-archives

nzbget · Jul 1, 2017 · 17fbb79 · 17fbb79
1 parent 35e65e7
commit 17fbb79
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/daemon/postprocess/RarReader.cpp b/daemon/postprocess/RarReader.cpp
@@ -268,6 +268,12 @@ RarVolume::RarBlock RarVolume::ReadRar3Block(DiskFile& file)
 	uint16 size = ((uint16)buf[6] << 8) + buf[5];
 
 	uint32 blocksize = size;
+	if (m_encrypted)
+	{
+		// Align to 16 bytes
+		blocksize = (blocksize + ((~blocksize + 1) & (16 - 1)));
+	}
+
 	block.trailsize = blocksize - sizeof(buf);
 
 	uint8 addbuf[4];