Skip to content

V
vlc
Commit 11489bdb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

MKV: reject invalid real audio data

parent 137c37b8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 10 deletions
modules/demux/mkv/matroska_segment.cpp
View file @ 11489bdb
...@@ -1262,17 +1262,24 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) ...@@ -1262,17 +1262,24 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
p_fmt->audio.i_rate = 8000; p_fmt->audio.i_rate = 8000;
p_fmt->audio.i_blockalign = 0x14; p_fmt->audio.i_blockalign = 0x14;
} }
else else if( p_tk->i_extra_data > 28 )
{ {
if( !strcmp( p_tk->psz_codec, "A_REAL/COOK" ) ) uint8_t *p = p_tk->p_extra_data;
p_tk->fmt.i_codec = VLC_CODEC_COOK; if( memcmp( p, ".ra", 3 ) ) {
else if( !strcmp( p_tk->psz_codec, "A_REAL/ATRC" ) ) msg_Err( &sys.demuxer, "Invalid Real ExtraData 0x%4.4s", (char *)p );
p_tk->fmt.i_codec = VLC_CODEC_ATRAC3; p_tk->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
else if( !strcmp( p_tk->psz_codec, "A_REAL/28_8" ) ) }
p_tk->fmt.i_codec = VLC_CODEC_RA_288; else {
/* FIXME RALF and SIPR */ if( !strcmp( p_tk->psz_codec, "A_REAL/COOK" ) )
p_tk->fmt.i_codec = VLC_CODEC_COOK;
fill_extra_data( p_tk, p_tk->fmt.i_codec == VLC_CODEC_RA_288 ? 0 : 78); else if( !strcmp( p_tk->psz_codec, "A_REAL/ATRC" ) )
p_tk->fmt.i_codec = VLC_CODEC_ATRAC3;
else if( !strcmp( p_tk->psz_codec, "A_REAL/28_8" ) )
p_tk->fmt.i_codec = VLC_CODEC_RA_288;
/* FIXME RALF and SIPR */
fill_extra_data( p_tk, p_tk->fmt.i_codec == VLC_CODEC_RA_288 ? 0 : 78);
}
} }
} }
else if( !strcmp( p_tk->psz_codec, "S_KATE" ) ) else if( !strcmp( p_tk->psz_codec, "S_KATE" ) )
......
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