Skip to content

V
vlc-2-2
Commit 0bac0634 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed initialization of asf_object_t inside ASF_ReadObject (fixed invalid 

free).
Removed useless memset after calloc.
parent 1308862f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
modules/demux/asf/libasf.c
View file @ 0bac0634
...@@ -619,8 +619,6 @@ static int ASF_ReadObject_codec_list( stream_t *s, asf_object_t *p_obj ) ...@@ -619,8 +619,6 @@ static int ASF_ReadObject_codec_list( stream_t *s, asf_object_t *p_obj )
{ {
p_cl->codec = calloc( p_cl->i_codec_entries_count, p_cl->codec = calloc( p_cl->i_codec_entries_count,
sizeof( asf_codec_entry_t ) ); sizeof( asf_codec_entry_t ) );
memset( p_cl->codec, 0,
p_cl->i_codec_entries_count * sizeof( asf_codec_entry_t ) );
p_data = p_peek + 44; p_data = p_peek + 44;
for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ ) for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
...@@ -1290,7 +1288,7 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj, ...@@ -1290,7 +1288,7 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj,
if( !p_obj ) if( !p_obj )
return( 0 ); return( 0 );
memset( p_obj, 0, sizeof( p_obj ) ); memset( p_obj, 0, sizeof( *p_obj ) );
if( ASF_ReadObjectCommon( s, p_obj ) ) if( ASF_ReadObjectCommon( s, p_obj ) )
{ {
......
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