Commit 0621dd1e authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

Don't leak memory in error paths

parent 4f28199b
...@@ -309,11 +309,15 @@ static int Open ( vlc_object_t *p_this ) ...@@ -309,11 +309,15 @@ static int Open ( vlc_object_t *p_this )
i_sdp_max - i_sdp - 1 ); i_sdp_max - i_sdp - 1 );
if( p_demux->b_die || p_demux->b_error ) if( p_demux->b_die || p_demux->b_error )
{
free( p_sdp );
goto error; goto error;
}
if( i_read < 0 ) if( i_read < 0 )
{ {
msg_Err( p_demux, "failed to read SDP" ); msg_Err( p_demux, "failed to read SDP" );
free( p_sdp );
goto error; goto error;
} }
...@@ -627,6 +631,12 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -627,6 +631,12 @@ static int SessionsSetup( demux_t *p_demux )
Boolean bInit; Boolean bInit;
live_track_t *tk; live_track_t *tk;
if( p_demux->b_die || p_demux->b_error )
{
delete iter;
return VLC_EGENERIC;
}
/* Value taken from mplayer */ /* Value taken from mplayer */
if( !strcmp( sub->mediumName(), "audio" ) ) if( !strcmp( sub->mediumName(), "audio" ) )
i_buffer = 100000; i_buffer = 100000;
...@@ -701,7 +711,11 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -701,7 +711,11 @@ static int SessionsSetup( demux_t *p_demux )
} }
tk = (live_track_t*)malloc( sizeof( live_track_t ) ); tk = (live_track_t*)malloc( sizeof( live_track_t ) );
if( !tk ) return VLC_ENOMEM; if( !tk )
{
delete iter;
return VLC_ENOMEM;
}
tk->p_demux = p_demux; tk->p_demux = p_demux;
tk->sub = sub; tk->sub = sub;
tk->p_es = NULL; tk->p_es = NULL;
...@@ -714,7 +728,11 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -714,7 +728,11 @@ static int SessionsSetup( demux_t *p_demux )
tk->i_pts = 0; tk->i_pts = 0;
tk->i_buffer = 65536; tk->i_buffer = 65536;
tk->p_buffer = (uint8_t *)malloc( 65536 ); tk->p_buffer = (uint8_t *)malloc( 65536 );
if( !tk->p_buffer ) return VLC_ENOMEM; if( !tk->p_buffer )
{
delete iter;
return VLC_ENOMEM;
}
/* Value taken from mplayer */ /* Value taken from mplayer */
if( !strcmp( sub->mediumName(), "audio" ) ) if( !strcmp( sub->mediumName(), "audio" ) )
......
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