Commit 03415034 authored by Rémi Duraffort's avatar Rémi Duraffort

No need to test for NULL before a free.

parent ffde9d55
...@@ -1482,8 +1482,7 @@ static void DecSysRelease( decoder_sys_t *p_sys ) ...@@ -1482,8 +1482,7 @@ static void DecSysRelease( decoder_sys_t *p_sys )
#ifdef HAVE_TIGER #ifdef HAVE_TIGER
if( p_sys->p_tr ) if( p_sys->p_tr )
tiger_renderer_destroy( p_sys->p_tr ); tiger_renderer_destroy( p_sys->p_tr );
if( p_sys->psz_tiger_default_font_desc ) free( p_sys->psz_tiger_default_font_desc );
free( p_sys->psz_tiger_default_font_desc );
#endif #endif
if (p_sys->b_ready) if (p_sys->b_ready)
......
...@@ -506,7 +506,7 @@ static int HandleFontAttributes( xml_reader_t *p_xml_reader, ...@@ -506,7 +506,7 @@ static int HandleFontAttributes( xml_reader_t *p_xml_reader,
{ {
if( !strcasecmp( "face", psz_name ) ) if( !strcasecmp( "face", psz_name ) )
{ {
if( psz_fontname ) free( psz_fontname ); free( psz_fontname );
psz_fontname = strdup( psz_value ); psz_fontname = strdup( psz_value );
} }
else if( !strcasecmp( "size", psz_name ) ) else if( !strcasecmp( "size", psz_name ) )
......
...@@ -238,8 +238,7 @@ static int Peek( stream_t *s, const uint8_t **pp_peek, unsigned int i_peek ) ...@@ -238,8 +238,7 @@ static int Peek( stream_t *s, const uint8_t **pp_peek, unsigned int i_peek )
return i_read; return i_read;
} }
if( p_sys->p_peek_alloc ) free( p_sys->p_peek_alloc );
free( p_sys->p_peek_alloc );
p_sys->p_peek_alloc = p_sys->p_peek_alloc =
p_sys->p_peek = p_peek; p_sys->p_peek = p_peek;
......
...@@ -317,8 +317,7 @@ static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -317,8 +317,7 @@ static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{ {
VLC_UNUSED( p_stream ); VLC_UNUSED( p_stream );
if ( id != NULL ) free( id );
free( id );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -1730,8 +1730,7 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block ) ...@@ -1730,8 +1730,7 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block )
p_owner->sout.i_id = p_dec->fmt_in.i_id; p_owner->sout.i_id = p_dec->fmt_in.i_id;
if( p_dec->fmt_in.psz_language ) if( p_dec->fmt_in.psz_language )
{ {
if( p_owner->sout.psz_language ) free( p_owner->sout.psz_language );
free( p_owner->sout.psz_language );
p_owner->sout.psz_language = p_owner->sout.psz_language =
strdup( p_dec->fmt_in.psz_language ); strdup( p_dec->fmt_in.psz_language );
} }
......
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