From: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu, 27 May 2010 13:17:42 +0000 (+0300)
Subject: Fix lzma_block_compressed_size().
X-Git-Tag: v5.0.0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07dc34f6da45c9ab757dad7fd5eef522ad27d296;p=thirdparty%2Fxz.git

Fix lzma_block_compressed_size().
---

diff --git a/src/liblzma/common/block_util.c b/src/liblzma/common/block_util.c
index cb9cde25..62c93454 100644
--- a/src/liblzma/common/block_util.c
+++ b/src/liblzma/common/block_util.c
@@ -15,7 +15,7 @@
 
 
 extern LZMA_API(lzma_ret)
-lzma_block_compressed_size(lzma_block *block, lzma_vli total_size)
+lzma_block_compressed_size(lzma_block *block, lzma_vli unpadded_size)
 {
 	// Validate everything but Uncompressed Size and filters.
 	if (lzma_block_unpadded_size(block) == 0)
@@ -25,13 +25,13 @@ lzma_block_compressed_size(lzma_block *block, lzma_vli total_size)
 			+ lzma_check_size(block->check);
 
 	// Validate that Compressed Size will be greater than zero.
-	if (container_size <= total_size)
+	if (unpadded_size <= container_size)
 		return LZMA_DATA_ERROR;
 
 	// Calculate what Compressed Size is supposed to be.
 	// If Compressed Size was present in Block Header,
 	// compare that the new value matches it.
-	const lzma_vli compressed_size = total_size - container_size;
+	const lzma_vli compressed_size = unpadded_size - container_size;
 	if (block->compressed_size != LZMA_VLI_UNKNOWN
 			&& block->compressed_size != compressed_size)
 		return LZMA_DATA_ERROR;