1
0
Fork 0

Merging upstream version 0.5.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-20 16:06:06 +01:00
parent c3fae6c0e1
commit e6ef0b0279
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
15 changed files with 64 additions and 59 deletions

View file

@ -335,7 +335,7 @@ int LZ_decompress_read( void * const decoder, uint8_t * const buffer,
if( d.ibuf->used_bytes() < 5 + (int)sizeof( File_header ) )
{
if( !d.ibuf->at_stream_end() || d.ibuf->finished() ) return 0;
d.ibuf->purge();
d.ibuf->purge(); // remove trailing garbage
d.lz_errno = LZ_header_error;
return -1;
}
@ -346,12 +346,12 @@ int LZ_decompress_read( void * const decoder, uint8_t * const buffer,
header.dictionary_size() < min_dictionary_size ||
header.dictionary_size() > max_dictionary_size )
{
d.ibuf->purge();
d.ibuf->purge(); // remove trailing garbage
d.lz_errno = LZ_header_error;
return -1;
}
try { d.lz_decoder = new LZ_decoder( header, *d.ibuf ); }
catch( std::bad_alloc )
catch( std::bad_alloc ) // not enough free memory
{
d.ibuf->purge();
d.lz_decoder = 0;