Commit 3b485335 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

port previous commits

parent c91f5912
......@@ -508,13 +508,13 @@ static void CloseDemux( vlc_object_t *p_this )
static void Run( services_discovery_t *p_sd )
{
int i;
int i;
/* read SAP packets */
while( !p_sd->b_die )
{
int i_read;
uint8_t p_buffer[MAX_SAP_BUFFER];
uint8_t p_buffer[MAX_SAP_BUFFER];
i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
p_sd->p_sys->i_fd, p_buffer,
......@@ -1071,8 +1071,15 @@ static sdp_t * ParseSDP( vlc_object_t *p_obj, char* psz_sdp )
}
p_sdp = (sdp_t *)malloc( sizeof( sdp_t ) );
if( p_sdp == NULL )
return NULL;
p_sdp->psz_sdp = strdup( psz_sdp );
if( p_sdp->psz_sdp == NULL )
{
free( p_sdp );
return NULL;
}
p_sdp->psz_sessionname = NULL;
p_sdp->psz_media = NULL;
......@@ -1118,7 +1125,7 @@ static sdp_t * ParseSDP( vlc_object_t *p_obj, char* psz_sdp )
if( psz_sdp[1] != '=' )
{
msg_Warn( p_obj, "invalid packet" ) ;
/* MEMLEAK ! */
FreeSDP( p_sdp );
return NULL;
}
......
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