videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

vlc_block_helper: fix offset peek 

returned incomplete peeks
This commit is contained in:
Francois Cartegnie 2017-07-21 22:40:14 +02:00
parent f9eac79333
commit 306f551e21
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/vlc_block_helper.h
View File

@ -231,13 +231,9 @@ static inline int block_SkipByte( block_bytestream_t *p_bytestream )
static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream,
size_t i_peek_offset, uint8_t *p_data, size_t i_data )
{
/* Check we have that much data, ignoring read offset */
if( p_bytestream->i_total < i_peek_offset ||
p_bytestream->i_total - i_peek_offset < i_data )
{
/* Not enough data, bail out */
const size_t i_remain = block_BytestreamRemaining( p_bytestream );
if( i_remain < i_data + i_peek_offset )
return VLC_EGENERIC;
}
/* Find the right place */
size_t i_offset = p_bytestream->i_block_offset;