diff options
Diffstat (limited to '')
| -rw-r--r-- | fast_encoder.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fast_encoder.cc b/fast_encoder.cc index 4574379..ba7c34c 100644 --- a/fast_encoder.cc +++ b/fast_encoder.cc @@ -60,12 +60,14 @@ Fmatchfinder::Fmatchfinder( const int ifd ) const int buffer_size_limit = ( 16 * dict_size ) + before_size + after_size; buffer_size = dict_size; buffer = (uint8_t *)std::malloc( buffer_size ); - if( !buffer ) throw std::bad_alloc(); + if( !buffer ) { delete[] prev_positions; throw std::bad_alloc(); } if( read_block() && !at_stream_end && buffer_size < buffer_size_limit ) { buffer_size = buffer_size_limit; - buffer = (uint8_t *)std::realloc( buffer, buffer_size ); - if( !buffer ) throw std::bad_alloc(); + uint8_t * const tmp = (uint8_t *)std::realloc( buffer, buffer_size ); + if( !tmp ) + { std::free( buffer ); delete[] prev_positions; throw std::bad_alloc(); } + buffer = tmp; read_block(); } if( at_stream_end && stream_pos < dict_size ) @@ -73,7 +75,9 @@ Fmatchfinder::Fmatchfinder( const int ifd ) else dictionary_size_ = dict_size; pos_limit = buffer_size; if( !at_stream_end ) pos_limit -= after_size; - prev_pos_chain = new int32_t[dictionary_size_]; + prev_pos_chain = new( std::nothrow ) int32_t[dictionary_size_]; + if( !prev_pos_chain ) + { std::free( buffer ); delete[] prev_positions; throw std::bad_alloc(); } for( int i = 0; i < num_prev_positions; ++i ) prev_positions[i] = -1; } |