Commit 664784f3 authored by Clément Stenac's avatar Clément Stenac

Fix crash when a session is deleted

parent 92b7ae98
...@@ -149,7 +149,7 @@ struct sdp_t ...@@ -149,7 +149,7 @@ struct sdp_t
char *psz_network_type; char *psz_network_type;
char *psz_address_type; char *psz_address_type;
char *psz_address; char *psz_address;
int i_session_id; int64_t i_session_id;
/* "computed" URI */ /* "computed" URI */
char *psz_uri; char *psz_uri;
...@@ -1033,7 +1033,7 @@ static sdp_t * ParseSDP( vlc_object_t *p_obj, char* psz_sdp ) ...@@ -1033,7 +1033,7 @@ static sdp_t * ParseSDP( vlc_object_t *p_obj, char* psz_sdp )
GET_FIELD( p_sdp->psz_username ); GET_FIELD( p_sdp->psz_username );
GET_FIELD( psz_sess_id ); GET_FIELD( psz_sess_id );
p_sdp->i_session_id = atoi( psz_sess_id ); p_sdp->i_session_id = atoll( psz_sess_id );
FREE( psz_sess_id ); FREE( psz_sess_id );
...@@ -1233,7 +1233,7 @@ static void FreeSDP( sdp_t *p_sdp ) ...@@ -1233,7 +1233,7 @@ static void FreeSDP( sdp_t *p_sdp )
static int RemoveAnnounce( services_discovery_t *p_sd, static int RemoveAnnounce( services_discovery_t *p_sd,
sap_announce_t *p_announce ) sap_announce_t *p_announce )
{ {
int i;
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd, playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
...@@ -1252,6 +1252,16 @@ static int RemoveAnnounce( services_discovery_t *p_sd, ...@@ -1252,6 +1252,16 @@ static int RemoveAnnounce( services_discovery_t *p_sd,
playlist_Delete( p_playlist, p_announce->p_item->input.i_id ); playlist_Delete( p_playlist, p_announce->p_item->input.i_id );
} }
for( i = 0; i< p_sd->p_sys->i_announces; i++)
{
if( p_sd->p_sys->pp_announces[i] == p_announce )
{
REMOVE_ELEM( p_sd->p_sys->pp_announces, p_sd->p_sys->i_announces,
i);
break;
}
}
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
free( p_announce ); free( p_announce );
......
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