# HG changeset patch # User lorenm # Date 1108941710 0 # Node ID ab32402c7e0949ae9ffcaffa64228940a88b5ff0 # Parent a7779d61c8cef179c6fd9bb4e0218de4ea21eef2 Fix a crash when multiple metadata packets are present. diff -r a7779d61c8ce -r ab32402c7e09 flac.c --- a/flac.c Thu Feb 17 19:03:12 2005 +0000 +++ b/flac.c Sun Feb 20 23:21:50 2005 +0000 @@ -591,12 +591,12 @@ int16_t *samples = data; if(s->max_framesize == 0){ - s->max_framesize= 8192; // should hopefully be enough for the first header + s->max_framesize= 65536; // should hopefully be enough for the first header s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); } if(1 && s->max_framesize){//FIXME truncated - buf_size= FFMIN(buf_size, s->max_framesize - s->bitstream_size); + buf_size= FFMAX(FFMIN(buf_size, s->max_framesize - s->bitstream_size), 0); input_buf_size= buf_size; if(s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size){ @@ -638,9 +638,6 @@ int bits_count= get_bits_count(&s->gb); metadata_streaminfo(s); - buf= &s->bitstream[s->bitstream_index]; - init_get_bits(&s->gb, buf, buf_size*8); - skip_bits(&s->gb, bits_count); dump_headers(s); break;}