Commit 7d587fff authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

fix use of uninitialized URI string pointer in SAP announce - closes #228

parent 0ae7c612
...@@ -585,7 +585,7 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session ) ...@@ -585,7 +585,7 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session )
{ {
int64_t i_sdp_id = mdate(); int64_t i_sdp_id = mdate();
int i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff); int i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff);
char *psz_group, *psz_name, psz_uri[NI_MAXHOST]; char *psz_group, *psz_name, psz_uribuf[NI_MAXHOST], *psz_uri;
char ipv; char ipv;
psz_group = convert_to_utf8( p_sap, p_session->psz_group ); psz_group = convert_to_utf8( p_sap, p_session->psz_group );
...@@ -598,15 +598,18 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session ) ...@@ -598,15 +598,18 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session )
{ {
char *ptr; char *ptr;
strncpy( psz_uri, p_session->psz_uri + 1, sizeof( psz_uri ) ); strncpy( psz_uribuf, p_session->psz_uri + 1, sizeof( psz_uribuf ) );
psz_uri[sizeof( psz_uri ) - 1] = '\0'; psz_uribuf[sizeof( psz_uribuf ) - 1] = '\0';
ptr = strchr( psz_uri, '%' ); ptr = strchr( psz_uribuf, '%' );
if( ptr != NULL) if( ptr != NULL)
*ptr = '\0'; *ptr = '\0';
ptr = strchr( psz_uri, ']' ); ptr = strchr( psz_uribuf, ']' );
if( ptr != NULL) if( ptr != NULL)
*ptr = '\0'; *ptr = '\0';
psz_uri = psz_uribuf;
} }
else
psz_uri = p_session->psz_uri;
/* see the lists in modules/stream_out/rtp.c for compliance stuff */ /* see the lists in modules/stream_out/rtp.c for compliance stuff */
p_session->psz_sdp = (char *)malloc( p_session->psz_sdp = (char *)malloc(
......
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