mmo-ref/dep-minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2026-08-25 14:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #233

Browse source
This commit is contained in:
juanii 2018-02-11 20:55:57 -03:00
parent 7a3820c539
commit 55bcdaf3c4
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mz_strm_lzma.c
View file

@ -55,6 +55,7 @@ typedef struct mz_stream_lzma_s {
int64_t total_in;
int64_t total_out;
int64_t max_total_in;
int64_t max_total_out;
int8_t initialized;
uint32_t preset;
} mz_stream_lzma;
@ -181,6 +182,8 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
total_in_after = lzma->lstream.avail_in;
total_out_after = lzma->lstream.total_out;
if (lzma->max_total_out != -1 && total_out_after > lzma->max_total_out)
total_out_after = lzma->max_total_out;
in_bytes = (uint32_t)(total_in_before - total_in_after);
out_bytes = (uint32_t)(total_out_after - total_out_before);
@ -346,6 +349,11 @@ int32_t mz_stream_lzma_set_prop_int64(void *stream, int32_t prop, int64_t value)
case MZ_STREAM_PROP_TOTAL_IN_MAX:
lzma->max_total_in = value;
return MZ_OK;
case MZ_STREAM_PROP_TOTAL_OUT_MAX:
if (value < -1)
return MZ_PARAM_ERROR;
lzma->max_total_out = value;
return MZ_OK;
}
return MZ_EXIST_ERROR;
}
@ -360,6 +368,7 @@ void *mz_stream_lzma_create(void **stream)
memset(lzma, 0, sizeof(mz_stream_lzma));
lzma->stream.vtbl = &mz_stream_lzma_vtbl;
lzma->preset = LZMA_PRESET_DEFAULT;
lzma->max_total_out = -1;
}
if (stream != NULL)
*stream = lzma;
@ -391,4 +400,4 @@ static int32_t mz_stream_lzma_crc32(int32_t value, const void *buf, int32_t size
void *mz_stream_lzma_get_crc32_update(void)
{
return (void *)mz_stream_lzma_crc32;
}
}

6
src/mz_zip.c
View file

@ -1168,6 +1168,12 @@ static int32_t mz_zip_entry_open_int(void *handle, int16_t compression_method, i
max_total_in -= total_in;
mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in);
}
if (zip->compression_method == MZ_COMPRESS_METHOD_LZMA &&
(zip->file_info.flag & MZ_ZIP_FLAG_LZMA_EOS_MARKER) == 0)
{
mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, zip->file_info.compressed_size);
mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT_MAX, zip->file_info.uncompressed_size);
}
}
mz_stream_set_base(zip->compress_stream, zip->crypt_stream);