aboutsummaryrefslogtreecommitdiff
path: root/C/XzIn.c
diff options
context:
space:
mode:
Diffstat (limited to 'C/XzIn.c')
-rw-r--r--C/XzIn.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/C/XzIn.c b/C/XzIn.c
index d0fc763..b68af96 100644
--- a/C/XzIn.c
+++ b/C/XzIn.c
@@ -1,5 +1,5 @@
1/* XzIn.c - Xz input 1/* XzIn.c - Xz input
22023-04-02 : Igor Pavlov : Public domain */ 22023-09-07 : Igor Pavlov : Public domain */
3 3
4#include "Precomp.h" 4#include "Precomp.h"
5 5
@@ -27,7 +27,7 @@ SRes Xz_ReadHeader(CXzStreamFlags *p, ISeqInStreamPtr inStream)
27} 27}
28 28
29#define READ_VARINT_AND_CHECK(buf, pos, size, res) \ 29#define READ_VARINT_AND_CHECK(buf, pos, size, res) \
30 { unsigned s = Xz_ReadVarInt(buf + pos, size - pos, res); \ 30 { const unsigned s = Xz_ReadVarInt(buf + pos, size - pos, res); \
31 if (s == 0) return SZ_ERROR_ARCHIVE; \ 31 if (s == 0) return SZ_ERROR_ARCHIVE; \
32 pos += s; } 32 pos += s; }
33 33
@@ -37,7 +37,7 @@ SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStreamPtr inStream, BoolInt *isIndex,
37 unsigned headerSize; 37 unsigned headerSize;
38 *headerSizeRes = 0; 38 *headerSizeRes = 0;
39 RINOK(SeqInStream_ReadByte(inStream, &header[0])) 39 RINOK(SeqInStream_ReadByte(inStream, &header[0]))
40 headerSize = (unsigned)header[0]; 40 headerSize = header[0];
41 if (headerSize == 0) 41 if (headerSize == 0)
42 { 42 {
43 *headerSizeRes = 1; 43 *headerSizeRes = 1;
@@ -47,7 +47,7 @@ SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStreamPtr inStream, BoolInt *isIndex,
47 47
48 *isIndex = False; 48 *isIndex = False;
49 headerSize = (headerSize << 2) + 4; 49 headerSize = (headerSize << 2) + 4;
50 *headerSizeRes = headerSize; 50 *headerSizeRes = (UInt32)headerSize;
51 { 51 {
52 size_t processedSize = headerSize - 1; 52 size_t processedSize = headerSize - 1;
53 RINOK(SeqInStream_ReadMax(inStream, header + 1, &processedSize)) 53 RINOK(SeqInStream_ReadMax(inStream, header + 1, &processedSize))
@@ -58,7 +58,7 @@ SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStreamPtr inStream, BoolInt *isIndex,
58} 58}
59 59
60#define ADD_SIZE_CHECK(size, val) \ 60#define ADD_SIZE_CHECK(size, val) \
61 { UInt64 newSize = size + (val); if (newSize < size) return XZ_SIZE_OVERFLOW; size = newSize; } 61 { const UInt64 newSize = size + (val); if (newSize < size) return XZ_SIZE_OVERFLOW; size = newSize; }
62 62
63UInt64 Xz_GetUnpackSize(const CXzStream *p) 63UInt64 Xz_GetUnpackSize(const CXzStream *p)
64{ 64{