Backport [20454] and [20448]

modules/access/cdda.c

@@ -630,18 +630,17 @@ static int GetTracks( access_t *p_access, vlc_bool_t b_separate,
                     {
                         vlc_input_item_AddInfo( &p_item->input,
                                             _(VLC_META_INFO_CAT),
-                                            _(VLC_META_TITLE),
+                                            _(VLC_META_TITLE), "%s", 
                                             cddb_track_get_title( t ) );
                         if( p_item->input.psz_name )
                             free( p_item->input.psz_name );
-                        asprintf( &p_item->input.psz_name, "%s",
-                                  cddb_track_get_title( t ) );
+                        p_item->input.psz_name = strdup( cddb_track_get_title( t ) );
                     }
                     psz_result = cddb_track_get_artist( t );
                     if( psz_result )
                     {
                         vlc_input_item_AddInfo( &p_item->input,
-                                            _(VLC_META_INFO_CAT),
+                                            _(VLC_META_INFO_CAT), "%s",
                                             _(VLC_META_ARTIST), psz_result );
                     }
                 }

modules/services_discovery/sap.c

@@ -840,12 +840,12 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
     if( psz_value != NULL )
     {
         vlc_input_item_AddInfo( &p_item->input, _("Session"),
-                                _("Tool"), psz_value );
+                                _("Tool"), "%s", psz_value );
     }
     if( strcmp( p_sdp->psz_username, "-" ) )
     {
         vlc_input_item_AddInfo( &p_item->input, _("Session"),
-                                _("User"), p_sdp->psz_username );
+                                _("User"), "%s", p_sdp->psz_username );
     }
 
     psz_value = GetAttribute( p_sap->p_sdp, "x-plgroup" );