summaryrefslogtreecommitdiff
path: root/lib/sqfs/comp/xz.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-27 18:43:07 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-27 18:43:07 +0200
commitcdb1c79153b2b1377fa0ca7e1beda2b6b9b2c687 (patch)
tree18217e4bdff2e4e37adccbb7e078623f4fac3e6b /lib/sqfs/comp/xz.c
parent40232f4bd4d7e8e001f7d1e8f120606f59b2c147 (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/xz.c')
-rw-r--r--lib/sqfs/comp/xz.c28
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/sqfs/comp/xz.c b/lib/sqfs/comp/xz.c
index d905f2d..9e03df8 100644
--- a/lib/sqfs/comp/xz.c
+++ b/lib/sqfs/comp/xz.c
@@ -74,9 +74,9 @@ static int xz_read_options(sqfs_compressor_t *base, sqfs_file_t *file)
return 0;
}
-static ssize_t compress(xz_compressor_t *xz, lzma_vli filter,
- const sqfs_u8 *in, size_t size,
- sqfs_u8 *out, size_t outsize)
+static sqfs_s32 compress(xz_compressor_t *xz, lzma_vli filter,
+ const sqfs_u8 *in, sqfs_u32 size,
+ sqfs_u8 *out, sqfs_u32 outsize)
{
lzma_filter filters[5];
lzma_options_lzma opt;
@@ -135,13 +135,16 @@ static lzma_vli flag_to_vli(int flag)
return LZMA_VLI_UNKNOWN;
}
-static ssize_t xz_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
- size_t size, sqfs_u8 *out, size_t outsize)
+static sqfs_s32 xz_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
+ sqfs_u32 size, sqfs_u8 *out, sqfs_u32 outsize)
{
xz_compressor_t *xz = (xz_compressor_t *)base;
lzma_vli filter, selected = LZMA_VLI_UNKNOWN;
- size_t i, smallest;
- ssize_t ret;
+ sqfs_s32 ret, smallest;
+ size_t i;
+
+ if (size >= 0x7FFFFFFF)
+ return 0;
ret = compress(xz, LZMA_VLI_UNKNOWN, in, size, out, outsize);
if (ret < 0 || xz->flags == 0)
@@ -159,7 +162,7 @@ static ssize_t xz_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
if (ret < 0)
return ret;
- if (ret > 0 && (smallest == 0 || (size_t)ret < smallest)) {
+ if (ret > 0 && (smallest == 0 || ret < smallest)) {
smallest = ret;
selected = filter;
}
@@ -171,8 +174,8 @@ static ssize_t xz_comp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
return compress(xz, selected, in, size, out, outsize);
}
-static ssize_t xz_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
- size_t size, sqfs_u8 *out, size_t outsize)
+static sqfs_s32 xz_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
+ sqfs_u32 size, sqfs_u8 *out, sqfs_u32 outsize)
{
sqfs_u64 memlimit = 32 * 1024 * 1024;
size_t dest_pos = 0;
@@ -180,12 +183,15 @@ static ssize_t xz_uncomp_block(sqfs_compressor_t *base, const sqfs_u8 *in,
lzma_ret ret;
(void)base;
+ if (outsize >= 0x7FFFFFFF)
+ return 0;
+
ret = lzma_stream_buffer_decode(&memlimit, 0, NULL,
in, &src_pos, size,
out, &dest_pos, outsize);
if (ret == LZMA_OK && size == src_pos)
- return (ssize_t)dest_pos;
+ return dest_pos;
return SQFS_ERROR_COMPRESSOR;
}