Skip to content

V
vlc-2-2
Commit ddc3eafe authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

mpeg_audio: assume block_GetBytes can fail

parent 11d3a7ac
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/codec/mpeg_audio.c
View file @ ddc3eafe
...@@ -448,10 +448,12 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -448,10 +448,12 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->i_free_frame_size = p_sys->i_frame_size; p_sys->i_free_frame_size = p_sys->i_frame_size;
} }
/* Copy the whole frame into the buffer. When we reach this point /* Copy the whole frame into the buffer. */
* we already know we have enough data available. */ if (block_GetBytes( &p_sys->bytestream,
block_GetBytes( &p_sys->bytestream, p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) )) {
p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) ); block_Release(p_out_buffer);
return NULL;
}
/* Get beginning of next frame for libmad */ /* Get beginning of next frame for libmad */
if( !p_sys->b_packetizer ) if( !p_sys->b_packetizer )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment