claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where ...allocate_output_() might allocate the wrong number of channels if the decoder hit a bad frame header

Browse Source
This commit is contained in:
Josh Coalson
2001-03-23 20:20:43 +00:00
parent e850ded476
commit 1e1509fb35
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libFLAC/stream_decoder.c
View File

@@ -35,7 +35,7 @@ typedef struct FLAC__StreamDecoderPrivate {
FLAC__BitBuffer input; FLAC__BitBuffer input;
int32 *output[FLAC__MAX_CHANNELS]; int32 *output[FLAC__MAX_CHANNELS];
int32 *residual[FLAC__MAX_CHANNELS]; int32 *residual[FLAC__MAX_CHANNELS];
unsigned output_capacity; unsigned output_capacity, output_channels;
uint32 last_frame_number; uint32 last_frame_number;
uint64 samples_decoded; uint64 samples_decoded;
bool has_stream_header; bool has_stream_header;
@@ -45,7 +45,7 @@ typedef struct FLAC__StreamDecoderPrivate {
static byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; static byte ID3V2_TAG_[3] = { 'I', 'D', '3' };
static bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size); static bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigned channels);
static bool stream_decoder_find_metadata_(FLAC__StreamDecoder *decoder); static bool stream_decoder_find_metadata_(FLAC__StreamDecoder *decoder);
static bool stream_decoder_read_metadata_(FLAC__StreamDecoder *decoder); static bool stream_decoder_read_metadata_(FLAC__StreamDecoder *decoder);
static bool stream_decoder_skip_id3v2_tag_(FLAC__StreamDecoder *decoder); static bool stream_decoder_skip_id3v2_tag_(FLAC__StreamDecoder *decoder);
@@ -144,6 +144,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
} }
decoder->guts->output_capacity = 0; decoder->guts->output_capacity = 0;
decoder->guts->output_channels = 0;
decoder->guts->last_frame_number = 0; decoder->guts->last_frame_number = 0;
decoder->guts->samples_decoded = 0; decoder->guts->samples_decoded = 0;
decoder->guts->has_stream_header = false; decoder->guts->has_stream_header = false;
@@ -340,12 +341,12 @@ unsigned FLAC__stream_decoder_input_bytes_unconsumed(FLAC__StreamDecoder *decode
return decoder->guts->input.bytes - decoder->guts->input.consumed_bytes; return decoder->guts->input.bytes - decoder->guts->input.consumed_bytes;
} }
bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size) bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigned channels)
{ {
unsigned i; unsigned i;
int32 *tmp; int32 *tmp;
if(size <= decoder->guts->output_capacity) if(size <= decoder->guts->output_capacity && channels <= decoder->guts->output_channels)
return true; return true;
/* @@@ should change to use realloc() */ /* @@@ should change to use realloc() */
@@ -361,7 +362,7 @@ bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size
} }
} }
for(i = 0; i < decoder->guts->frame.header.channels; i++) { for(i = 0; i < channels; i++) {
tmp = (int32*)malloc(sizeof(int32)*size); tmp = (int32*)malloc(sizeof(int32)*size);
if(tmp == 0) { if(tmp == 0) {
decoder->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; decoder->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
@@ -378,6 +379,7 @@ bool stream_decoder_allocate_output_(FLAC__StreamDecoder *decoder, unsigned size
} }
decoder->guts->output_capacity = size; decoder->guts->output_capacity = size;
decoder->guts->output_channels = channels;
return true; return true;
} }
@@ -599,7 +601,7 @@ bool stream_decoder_read_frame_(FLAC__StreamDecoder *decoder, bool *got_a_frame)
decoder->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; decoder->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
return true; return true;
} }
if(!stream_decoder_allocate_output_(decoder, decoder->guts->frame.header.blocksize)) if(!stream_decoder_allocate_output_(decoder, decoder->guts->frame.header.blocksize, decoder->guts->frame.header.channels))
return false; return false;
for(channel = 0; channel < decoder->guts->frame.header.channels; channel++) { for(channel = 0; channel < decoder->guts->frame.header.channels; channel++) {
/* /*