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

mz_strm_ppmd.c reader issue: it can't detect EOF (#953)

Browse source 
Fixes #950
This commit is contained in:
Paul Marquess 2026-02-02 19:05:14 +00:00 • committed by GitHub
parent aa00b1d369
commit 020b11a8ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mz_strm_ppmd.c
View file

@ -29,6 +29,10 @@ static mz_stream_vtbl mz_stream_ppmd_vtbl = {
#define PPMD_PRESET_DEFAULT 9 // Should match default in 7-Zip
// Return values from Ppmd8_DecodeSymbol
#define PPMD_RESULT_EOF (-1)
#define PPMD_RESULT_ERROR (-2)
/***************************************************************************/
typedef struct mz_in_buffer_s {
@ -148,10 +152,7 @@ static Byte reader(void *p) {
int32_t status;
if ((status = mz_stream_read_uint8((mz_stream_ppmd *)ppmd->stream.base, &b)) != MZ_OK) {
if (b == -1) // EOF
ppmd->end_stream = 1;
else
ppmd->error = status;
ppmd->error = status;
b = 0;
} else
++ppmd->total_in;
@ -323,19 +324,24 @@ int32_t mz_stream_ppmd_read(void *stream, void *buf, int32_t size) {
for (avail_out = size; avail_out > 0 && avail_in > 0; avail_out--, avail_in--) {
sym = Ppmd8_DecodeSymbol(&ppmd->ppmd8);
if (sym < 0 || ppmd->end_stream || ppmd->error)
/* There are two ways to terminate the loop early:
1. Ppmd8_DecodeSymbol returns a negative number to flag EOF or stream error.
2. ppmd->error gets set to true here when the call to mz_stream_read_uint8
in reader() does not return MZ_OK.
*/
if (sym < 0 || ppmd->error)
break;
*(next_out++) = sym;
++written;
}
if (sym == -1) {
// end_stream
// sym contains the return code from Ppmd8_DecodeSymbol
if (sym == PPMD_RESULT_EOF) {
ppmd->end_stream = 1;
// Drop through and return written bytes
} else if (sym == -2) {
} else if (sym == PPMD_RESULT_ERROR) {
/* Insufficient input data. */
return MZ_STREAM_ERROR;
} else if (ppmd->error) {