hds_stream->chunks_head = chunk;
}
+#define SAFE_STRDUP( dest, src, ret ) \
+ if( !( (dest) = strdup( (src) ) ) ) \
+ return (ret)
+
static void* live_thread( void* p )
{
vlc_object_t* p_this = (vlc_object_t*)p;
if( hds_stream->abst_url &&
( isFQUrl( hds_stream->abst_url ) ) )
{
- abst_url = strdup ( hds_stream->abst_url );
+ SAFE_STRDUP( abst_url, hds_stream->abst_url, NULL );
}
else
{
{
case XML_READER_STARTELEM:
if( current_element_idx == 0 && element_stack[current_element_idx] == 0 ) {
- element_stack[current_element_idx] = strdup( node );
+ SAFE_STRDUP( element_stack[current_element_idx], node, VLC_ENOMEM );
} else {
- element_stack[++current_element_idx] = strdup( node );
+ SAFE_STRDUP( element_stack[++current_element_idx], node, VLC_ENOMEM );
}
+
break;
case XML_READER_ENDELEM:
if( ! strcmp( current_element, "bootstrapInfo") ) {
{
if( !strcmp(attr_name, "streamId" ) )
{
- medias[media_idx].stream_id = strdup( attr_value );
+ SAFE_STRDUP( medias[media_idx].stream_id, attr_value, VLC_ENOMEM );
}
if( !strcmp(attr_name, "url" ) )
{
- medias[media_idx].media_url = strdup( attr_value );
+ SAFE_STRDUP( medias[media_idx].media_url, attr_value, VLC_ENOMEM );
}
if( !strcmp(attr_name, "bootstrapInfoId" ) )
{
- medias[media_idx].bootstrap_id = strdup( attr_value );
+ SAFE_STRDUP( medias[media_idx].bootstrap_id, attr_value, VLC_ENOMEM );
}
}
{
if( !strcmp(attr_name, "url" ) )
{
- bootstraps[bootstrap_idx].url = strdup( attr_value );
+ SAFE_STRDUP( bootstraps[bootstrap_idx].url, attr_value, VLC_ENOMEM );
}
if( !strcmp(attr_name, "id" ) )
{
- bootstraps[bootstrap_idx].id = strdup( attr_value );
+ SAFE_STRDUP( bootstraps[bootstrap_idx].id, attr_value, VLC_ENOMEM );
}
if( !strcmp(attr_name, "profile" ) )
{
- bootstraps[bootstrap_idx].profile = strdup( attr_value );
+ SAFE_STRDUP( bootstraps[bootstrap_idx].profile, attr_value, VLC_ENOMEM );
}
}
}
if( current_element &&
! strcmp( element_stack[current_element_idx-1], "manifest" ) )
{
- media_id = strdup( node );
+ SAFE_STRDUP( media_id, node, VLC_ENOMEM );
}
}
}
if( medias[i].media_url )
{
- new_stream->url = strdup( medias[i].media_url );
+ SAFE_STRDUP( new_stream->url, medias[i].media_url, VLC_ENOMEM );
}
if( ! sys->live )
}
else
{
- new_stream->abst_url = strdup( bootstraps[j].url );
+ SAFE_STRDUP( new_stream->abst_url, bootstraps[j].url, VLC_ENOMEM );
}
vlc_array_append( sys->hds_streams, new_stream );
return VLC_SUCCESS;
}
+#undef SAFE_STRDUP
+
static void hds_free( hds_stream_t *p_stream )
{
FREENULL( p_stream->quality_segment_modifier );