diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 18:43:07 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 18:43:07 +0200 |
| commit | cdb1c79153b2b1377fa0ca7e1beda2b6b9b2c687 (patch) | |
| tree | 18217e4bdff2e4e37adccbb7e078623f4fac3e6b /lib/sqfs/comp/lzma.c | |
| parent | 40232f4bd4d7e8e001f7d1e8f120606f59b2c147 (diff) | |
Remove use of ssize_t from library API
ssize_t is only available on POSIX platforms and even there it is
only defined to hold at least -1 in the range of negative numbers.
This commit replaces ssize_t return types with sqfs_s32 and the
coresponding function arguments with sqfs_u32. Because the range
of positiv numbers for a signed 32 bit number is only half that of
the unsigned version, additional checks have to be added.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfs/comp/lzma.c')
| -rw-r--r-- | lib/sqfs/comp/lzma.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/sqfs/comp/lzma.c b/lib/sqfs/comp/lzma.c index f4211fb..0238df0 100644 --- a/lib/sqfs/comp/lzma.c +++ b/lib/sqfs/comp/lzma.c @@ -39,15 +39,15 @@ static int lzma_read_options(sqfs_compressor_t *base, sqfs_file_t *file) return SQFS_ERROR_UNSUPPORTED; } -static ssize_t lzma_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in, - size_t size, sqfs_u8 *out, size_t outsize) +static sqfs_s32 lzma_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in, + sqfs_u32 size, sqfs_u8 *out, sqfs_u32 outsize) { lzma_compressor_t *lzma = (lzma_compressor_t *)base; lzma_stream strm = LZMA_STREAM_INIT; lzma_options_lzma opt; int ret; - if (outsize < LZMA_HEADER_SIZE) + if (outsize < LZMA_HEADER_SIZE || size >= 0x7FFFFFFF) return 0; lzma_lzma_preset(&opt, LZMA_DEFAULT_LEVEL); @@ -83,8 +83,8 @@ static ssize_t lzma_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in, return strm.total_out; } -static ssize_t lzma_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in, - size_t size, sqfs_u8 *out, size_t outsize) +static sqfs_s32 lzma_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in, + sqfs_u32 size, sqfs_u8 *out, sqfs_u32 outsize) { sqfs_u8 lzma_header[LZMA_HEADER_SIZE]; lzma_stream strm = LZMA_STREAM_INIT; @@ -92,6 +92,9 @@ static ssize_t lzma_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in, int ret; (void)base; + if (size >= 0x7FFFFFFF) + return 0; + if (size < sizeof(lzma_header)) return SQFS_ERROR_CORRUPTED; |