mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix erroneous assertion

Browse Source
This commit is contained in:
Josh Coalson 2004-07-24 00:02:46 +00:00
parent 98a81f505a
commit e04f0c424e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/flac/decode.c
View File

@ -1020,7 +1020,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
} }
} }
} }
FLAC__ASSERT(bytes_to_write > 0); if(bytes_to_write > 0) {
if(flac__utils_fwrite(u8buffer, 1, bytes_to_write, fout) != bytes_to_write) { if(flac__utils_fwrite(u8buffer, 1, bytes_to_write, fout) != bytes_to_write) {
/* if a pipe closed when writing to stdout, we let it go without an error message */ /* if a pipe closed when writing to stdout, we let it go without an error message */
if(errno == EPIPE && decoder_session->fout == stdout) if(errno == EPIPE && decoder_session->fout == stdout)
@ -1028,6 +1028,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F
decoder_session->abort_flag = true; decoder_session->abort_flag = true;
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
} }
}
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
} }

2
src/libFLAC/stream_encoder_framing.c
View File

@ -197,7 +197,7 @@ FLAC__bool FLAC__frame_add_header(const FLAC__FrameHeader *header, FLAC__bool st
FLAC__ASSERT(header->blocksize > 0 && header->blocksize <= FLAC__MAX_BLOCK_SIZE); FLAC__ASSERT(header->blocksize > 0 && header->blocksize <= FLAC__MAX_BLOCK_SIZE);
/* when this assertion holds true, any legal blocksize can be expressed in the frame header */ /* when this assertion holds true, any legal blocksize can be expressed in the frame header */
FLAC__ASSERT(FLAC__MAX_BLOCK_SIZE <= (1u << FLAC__FRAME_HEADER_BLOCK_SIZE_LEN)); FLAC__ASSERT(FLAC__MAX_BLOCK_SIZE <= 65535u);
blocksize_hint = 0; blocksize_hint = 0;
switch(header->blocksize) { switch(header->blocksize) {
case 192: u = 1; break; case 192: u = 1; break;