diff options
Diffstat (limited to 'lzlib.c')
| -rw-r--r-- | lzlib.c | 58 |
1 files changed, 32 insertions, 26 deletions
@@ -1,5 +1,5 @@ /* Lzlib - Compression library for the lzip format - Copyright (C) 2009-2018 Antonio Diaz Diaz. + Copyright (C) 2009-2019 Antonio Diaz Diaz. This library is free software. Redistribution and use in source and binary forms, with or without modification, are permitted provided @@ -65,7 +65,7 @@ struct LZ_Decoder struct Range_decoder * rdec; struct LZ_decoder * lz_decoder; enum LZ_Errno lz_errno; - File_header member_header; /* header of current member */ + Lzip_header member_header; /* header of current member */ bool fatal; bool first_header; /* true until first header is read */ bool seeking; @@ -79,7 +79,7 @@ static void LZ_Decoder_init( struct LZ_Decoder * const d ) d->rdec = 0; d->lz_decoder = 0; d->lz_errno = LZ_ok; - for( i = 0; i < Fh_size; ++i ) d->member_header[i] = 0; + for( i = 0; i < Lh_size; ++i ) d->member_header[i] = 0; d->fatal = false; d->first_header = true; d->seeking = false; @@ -119,7 +119,7 @@ const char * LZ_strerror( const enum LZ_Errno lz_errno ) case LZ_mem_error : return "Not enough memory"; case LZ_sequence_error: return "Sequence error"; case LZ_header_error : return "Header error"; - case LZ_unexpected_eof: return "Unexpected eof"; + case LZ_unexpected_eof: return "Unexpected EOF"; case LZ_data_error : return "Data error"; case LZ_library_error : return "Library error"; } @@ -141,12 +141,12 @@ struct LZ_Encoder * LZ_compress_open( const int dictionary_size, const int match_len_limit, const unsigned long long member_size ) { - File_header header; + Lzip_header header; struct LZ_Encoder * const e = (struct LZ_Encoder *)malloc( sizeof (struct LZ_Encoder) ); if( !e ) return 0; LZ_Encoder_init( e ); - if( !Fh_set_dictionary_size( header, dictionary_size ) || + if( !Lh_set_dictionary_size( header, dictionary_size ) || match_len_limit < min_match_len_limit || match_len_limit > max_match_len || member_size < min_dictionary_size ) @@ -163,7 +163,7 @@ struct LZ_Encoder * LZ_compress_open( const int dictionary_size, else { e->lz_encoder = (struct LZ_encoder *)malloc( sizeof (struct LZ_encoder) ); - if( e->lz_encoder && LZe_init( e->lz_encoder, Fh_get_dictionary_size( header ), + if( e->lz_encoder && LZe_init( e->lz_encoder, Lh_get_dictionary_size( header ), match_len_limit, member_size ) ) { e->lz_encoder_base = &e->lz_encoder->eb; return e; } free( e->lz_encoder ); e->lz_encoder = 0; @@ -193,10 +193,10 @@ int LZ_compress_finish( struct LZ_Encoder * const e ) /* if (open --> write --> finish) use same dictionary size as lzip. */ /* this does not save any memory. */ if( Mb_data_position( &e->lz_encoder_base->mb ) == 0 && - Re_member_position( &e->lz_encoder_base->renc ) == Fh_size ) + Re_member_position( &e->lz_encoder_base->renc ) == Lh_size ) { Mb_adjust_dictionary_size( &e->lz_encoder_base->mb ); - Fh_set_dictionary_size( e->lz_encoder_base->renc.header, + Lh_set_dictionary_size( e->lz_encoder_base->renc.header, e->lz_encoder_base->mb.dictionary_size ); e->lz_encoder_base->renc.cb.buffer[5] = e->lz_encoder_base->renc.header[5]; } @@ -400,7 +400,10 @@ int LZ_decompress_read( struct LZ_Decoder * const d, uint8_t * const buffer, const int size ) { int result; - if( !verify_decoder( d ) || d->fatal ) return -1; + if( !verify_decoder( d ) ) return -1; + if( d->fatal ) /* don't return error until pending bytes are read */ + { if( d->lz_decoder && !Cb_empty( &d->lz_decoder->cb ) ) goto get_data; + return -1; } if( d->seeking || size < 0 ) return 0; if( d->lz_decoder && LZd_member_finished( d->lz_decoder ) ) @@ -413,26 +416,26 @@ int LZ_decompress_read( struct LZ_Decoder * const d, int rd; d->partial_in_size += d->rdec->member_position; d->rdec->member_position = 0; - if( Rd_available_bytes( d->rdec ) < Fh_size + 5 && + if( Rd_available_bytes( d->rdec ) < Lh_size + 5 && !d->rdec->at_stream_end ) return 0; if( Rd_finished( d->rdec ) && !d->first_header ) return 0; - rd = Rd_read_data( d->rdec, d->member_header, Fh_size ); - if( Rd_finished( d->rdec ) ) /* End Of File */ + rd = Rd_read_data( d->rdec, d->member_header, Lh_size ); + if( rd < Lh_size || Rd_finished( d->rdec ) ) /* End Of File */ { - if( rd <= 0 || Fh_verify_prefix( d->member_header, rd ) ) + if( rd <= 0 || Lh_verify_prefix( d->member_header, rd ) ) d->lz_errno = LZ_unexpected_eof; else d->lz_errno = LZ_header_error; d->fatal = true; return -1; } - if( !Fh_verify_magic( d->member_header ) ) + if( !Lh_verify_magic( d->member_header ) ) { /* unreading the header prevents sync_to_member from skipping a member if leading garbage is shorter than a full header; "lgLZIP\x01\x0C" */ if( Rd_unread_data( d->rdec, rd ) ) { - if( d->first_header || !Fh_verify_corrupt( d->member_header ) ) + if( d->first_header || !Lh_verify_corrupt( d->member_header ) ) d->lz_errno = LZ_header_error; else d->lz_errno = LZ_data_error; /* corrupt header */ @@ -442,10 +445,12 @@ int LZ_decompress_read( struct LZ_Decoder * const d, d->fatal = true; return -1; } - if( !Fh_verify_version( d->member_header ) || - !isvalid_ds( Fh_get_dictionary_size( d->member_header ) ) ) + if( !Lh_verify_version( d->member_header ) || + !isvalid_ds( Lh_get_dictionary_size( d->member_header ) ) ) { - if( Rd_unread_data( d->rdec, 1 + !Fh_verify_version( d->member_header ) ) ) + /* Skip a possible "LZIP" leading garbage; "LZIPLZIP\x01\x0C". + Leave member_pos pointing to the first error. */ + if( Rd_unread_data( d->rdec, 1 + !Lh_verify_version( d->member_header ) ) ) d->lz_errno = LZ_data_error; /* bad version or bad dict size */ else d->lz_errno = LZ_library_error; @@ -464,7 +469,7 @@ int LZ_decompress_read( struct LZ_Decoder * const d, } d->lz_decoder = (struct LZ_decoder *)malloc( sizeof (struct LZ_decoder) ); if( !d->lz_decoder || !LZd_init( d->lz_decoder, d->rdec, - Fh_get_dictionary_size( d->member_header ) ) ) + Lh_get_dictionary_size( d->member_header ) ) ) { /* not enough free memory */ if( d->lz_decoder ) { LZd_free( d->lz_decoder ); free( d->lz_decoder ); d->lz_decoder = 0; } @@ -477,15 +482,16 @@ int LZ_decompress_read( struct LZ_Decoder * const d, result = LZd_decode_member( d->lz_decoder ); if( result != 0 ) { - if( result == 2 ) /* set position at EOF */ + if( result == 2 ) /* set input position at EOF */ { d->rdec->member_position += Cb_used_bytes( &d->rdec->cb ); Cb_reset( &d->rdec->cb ); d->lz_errno = LZ_unexpected_eof; } else if( result == 5 ) d->lz_errno = LZ_library_error; else d->lz_errno = LZ_data_error; d->fatal = true; - return -1; + if( Cb_empty( &d->lz_decoder->cb ) ) return -1; } +get_data: return Cb_read_data( &d->lz_decoder->cb, buffer, size ); } @@ -529,7 +535,7 @@ enum LZ_Errno LZ_decompress_errno( struct LZ_Decoder * const d ) int LZ_decompress_finished( struct LZ_Decoder * const d ) { - if( !verify_decoder( d ) ) return -1; + if( !verify_decoder( d ) || d->fatal ) return -1; return ( Rd_finished( d->rdec ) && ( !d->lz_decoder || LZd_member_finished( d->lz_decoder ) ) ); } @@ -537,7 +543,7 @@ int LZ_decompress_finished( struct LZ_Decoder * const d ) int LZ_decompress_member_finished( struct LZ_Decoder * const d ) { - if( !verify_decoder( d ) ) return -1; + if( !verify_decoder( d ) || d->fatal ) return -1; return ( d->lz_decoder && LZd_member_finished( d->lz_decoder ) ); } @@ -545,14 +551,14 @@ int LZ_decompress_member_finished( struct LZ_Decoder * const d ) int LZ_decompress_member_version( struct LZ_Decoder * const d ) { if( !verify_decoder( d ) ) return -1; - return Fh_version( d->member_header ); + return Lh_version( d->member_header ); } int LZ_decompress_dictionary_size( struct LZ_Decoder * const d ) { if( !verify_decoder( d ) ) return -1; - return Fh_get_dictionary_size( d->member_header ); + return Lh_get_dictionary_size( d->member_header ); } |