AMF_DATATYPE_SIZE_STRING + strlen( "file:///mac.flv" ) );
free( tmp_buffer );
- tmp_url = (char *) malloc( strlen( "rtmp://") + strlen( p_thread->url.psz_buffer ) + 1 );
- if( !tmp_url )
+ if( asprintf( &tmp_url, "rtmp://%s", p_thread->url.psz_buffer ) == -1 )
{
free( rtmp_body->body );
free( rtmp_body );
return -1;
}
- sprintf( tmp_url, "rtmp://%s", p_thread->url.psz_buffer );
tmp_buffer = amf_encode_object_variable( "tcUrl",
AMF_DATATYPE_STRING, tmp_url );
rtmp_body_append( rtmp_body, tmp_buffer,
AMF_DATATYPE_SIZE_STRING + strlen( "NetStream.Play.Reset" ) );
free( tmp_buffer );
- description = (char *) malloc( strlen( "Playing and resetting ") + strlen( psz_media ) + strlen( "." ) + 1 );
- if( !description )
+ if( asprintf( &description, "Playing and resetting %s.", psz_media ) == -1 )
{
free( rtmp_body->body );
free( rtmp_body );
return NULL;
}
- sprintf( description, "Playing and resetting %s.", psz_media );
tmp_buffer = amf_encode_object_variable( "description",
AMF_DATATYPE_STRING, description );
rtmp_body_append( rtmp_body, tmp_buffer,
AMF_DATATYPE_SIZE_STRING + strlen( "NetStream.Play.Start" ) );
free( tmp_buffer );
- description = (char *) malloc( strlen( "Started playing ") + strlen( psz_media ) + strlen( "." ) + 1 );
- if( !description )
+ if( asprintf( &description, "Started playing %s.", psz_media ) == -1 )
{
free( rtmp_body->body );
free( rtmp_body );
return NULL;
}
- sprintf( description, "Started playing %s.", psz_media );
tmp_buffer = amf_encode_object_variable( "description",
AMF_DATATYPE_STRING, description );
rtmp_body_append( rtmp_body, tmp_buffer,
}
else
{
- psz_cuefile = malloc( strlen(psz_dev) + 5 /* ".cue" */ );
- sprintf( psz_cuefile, "%s.cue", psz_dev );
+ if( asprintf( &psz_cuefile, "%s.cue", psz_dev ) == -1 )
+ psz_cuefile = NULL;
}
/* If we need to look up the .cue file, then we don't have to look for the vcd */
psz_vcdfile = strdup( psz_dev );
}
else
{
- vlm_error = malloc( strlen(vlm_answer->psz_name) +
- strlen(vlm_answer->psz_value) +
- strlen( " : ") + 1 );
- sprintf( vlm_error , "%s : %s" , vlm_answer->psz_name,
- vlm_answer->psz_value );
+ if( asprintf( &vlm_error , "%s : %s" ,
+ vlm_answer->psz_name,
+ vlm_answer->psz_value ) == -1 )
+ vlm_error = NULL;
}
mvar_AppendNewVar( p_args->vars, "vlm_error", vlm_error );
while( strcmp( psz_elt = SSPop( st ), "" )
&& strcmp( psz_elt, ";" ) )
{
- char *psz_buf =
- (char *)malloc( strlen( psz_cmd ) + strlen( psz_elt ) + 2 );
- sprintf( psz_buf, "%s %s", psz_cmd, psz_elt );
+ char* psz_buf;
+ if( asprintf( &psz_buf, "%s %s", psz_cmd, psz_elt ) == -1 )
+ psz_buf = NULL;
free( psz_cmd );
free( psz_elt );
psz_cmd = psz_buf;
}
else
{
- psz_error = malloc( strlen(vlm_answer->psz_name) +
- strlen(vlm_answer->psz_value) +
- strlen( " : ") + 1 );
- sprintf( psz_error , "%s : %s" , vlm_answer->psz_name,
- vlm_answer->psz_value );
+ if( asprintf( &psz_error , "%s : %s" , vlm_answer->psz_name,
+ vlm_answer->psz_value ) == -1 )
+ psz_error = NULL;
}
mvar_AppendNewVar( vars, "vlm_error", psz_error );
*psz_parser = '\0';
psz_parser++;
}
- psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
- if( psz_temp )
+
+ if( asprintf( &psz_temp, "%s,none", psz_module ) != -1 )
{
intf_thread_t *p_new_intf;
- sprintf( psz_temp, "%s,none", psz_module );
/* Try to create the interface */
p_new_intf = intf_Create( p_intf, psz_temp );
p_seg = used_segments[i];
if ( p_seg->p_editions != NULL )
{
- std::string sz_name;
input_title_t *p_title = vlc_input_title_New();
p_seg->i_sys_title = i;
int i_chapters;
{
if ( p_title->psz_name == NULL )
{
- sz_name = (*p_seg->p_editions)[j]->GetMainName();
- if ( sz_name != "" )
- p_title->psz_name = strdup( sz_name.c_str() );
+ const char* psz_tmp = (*p_seg->p_editions)[j]->GetMainName().c_str();
+ if( *psz_tmp != '\0' )
+ p_title->psz_name = strdup( psz_tmp );
}
chapter_edition_c *p_edition = (*p_seg->p_editions)[j];
// create a name if there is none
if ( p_title->psz_name == NULL )
{
- sz_name = N_("Segment");
- char psz_str[6];
- sprintf( psz_str, " %d", (int)i );
- sz_name += psz_str;
- p_title->psz_name = strdup( sz_name.c_str() );
+ if( asprintf(&(p_title->psz_name), "%s %d", N_("Segment"), (int)i) == -1 )
+ p_title->psz_name = NULL;
}
titles.push_back( p_title );
else
{
/* handle multi-line descriptions */
- buf = malloc( strlen( psz_description )
- + strlen( psz_attrvalue ) + 2 );
- sprintf( buf, "%s\n%s", psz_description, psz_attrvalue );
+ if( asprintf( &buf, "%s\n%s", psz_description, psz_attrvalue ) == -1 )
+ buf = NULL;
free( psz_description );
psz_description = buf;
}
if( psz_rt || psz_load )
{
/* tv */
- psz_mrl = malloc( strlen( SHOUTCAST_TV_TUNEIN_URL )
- + strlen( psz_id ) + 1 );
- sprintf( psz_mrl, SHOUTCAST_TV_TUNEIN_URL "%s",
- psz_id );
+ if( asprintf( &psz_mrl, SHOUTCAST_TV_TUNEIN_URL "%s",
+ psz_id ) == -1)
+ psz_mrl = NULL;
}
else
{
/* radio */
- psz_mrl = malloc( strlen( SHOUTCAST_TUNEIN_BASE_URL )
- + strlen( psz_base ) + strlen( "?id=" )
- + strlen( psz_id ) + 1 );
- sprintf( psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s",
- psz_base, psz_id );
+ if( asprintf( &psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s",
+ psz_base, psz_id ) == -1 )
+ psz_mrl = NULL;
}
p_input = input_item_NewExt( p_demux, psz_mrl,
psz_name , 0, NULL, -1 );
case ' ':
if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' )
{
- int i_size_entry = strlen( "directory://" ) +
- strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
+ char* psz_uri;
+ if( asprintf( &psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) == -1 )
+ psz_uri = NULL;
playlist_item_t *p_parent = p_sys->p_node;
if( !p_parent )
}
else
{
- int i_size_entry = strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
-
- p_sys->psz_current_dir = strdup( psz_uri );
- ReadDir( p_intf );
- free( psz_uri );
+ if( asprintf( &(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir,
+ p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) != -1 )
+ ReadDir( p_intf );
}
break;
default: