]> git.sesse.net Git - vlc/commitdiff
acoustid: use memcpy (cid #1062538)
authorFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 3 Oct 2014 12:17:59 +0000 (14:17 +0200)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 3 Oct 2014 13:40:10 +0000 (15:40 +0200)
strncpy triggers warning because the
struct is nonzero terminated.

modules/misc/fingerprinter.c
modules/misc/webservices/acoustid.c
modules/misc/webservices/acoustid.h

index 6beb81befdbf12b68efb67fb6bb97ea145395620..21e9f1e73c5315180caffe82a326b4fcf9ca39f0 100644 (file)
@@ -328,7 +328,7 @@ static void fill_metas_with_results( fingerprint_request_t *p_r, acoustid_finger
             {
                 vlc_meta_Set( p_meta, vlc_meta_Title, p_record->psz_title );
                 vlc_meta_Set( p_meta, vlc_meta_Artist, p_record->psz_artist );
-                vlc_meta_AddExtra( p_meta, "musicbrainz-id", p_record->sz_musicbrainz_id );
+                vlc_meta_AddExtra( p_meta, "musicbrainz-id", p_record->s_musicbrainz_id );
                 vlc_array_append( & p_r->results.metas_array, p_meta );
             }
         }
index f23be5afefa26bfef32175f8f9bb57ec33a36dc1..edbe47d53392e825711adbbea3c71d3d4ab7b6e2 100644 (file)
@@ -81,9 +81,9 @@ static void parse_recordings( vlc_object_t *p_obj, json_value *node, acoustid_re
             record->psz_title = strdup( value->u.string.ptr );
         value = jsongetbyname( recordnode, "id" );
         if ( value && value->type == json_string )
-            strncpy( record->sz_musicbrainz_id, value->u.string.ptr, MB_ID_SIZE );
+            memcpy( record->s_musicbrainz_id, value->u.string.ptr, MB_ID_SIZE );
         parse_artists( jsongetbyname( recordnode, "artists" ), record );
-        msg_Dbg( p_obj, "recording %d title %s %36s %s", i, record->psz_title, record->sz_musicbrainz_id, record->psz_artist );
+        msg_Dbg( p_obj, "recording %d title %s %36s %s", i, record->psz_title, record->s_musicbrainz_id, record->psz_artist );
     }
 }
 
index 313ad092869d1e82287cf0e628a13db15ea957b8..d7d54c975e886cd1a82136c379e7a6c6141cf133 100644 (file)
@@ -24,7 +24,7 @@ struct musicbrainz_recording_t
 {
     char *psz_artist;
     char *psz_title;
-    char sz_musicbrainz_id[MB_ID_SIZE];
+    char s_musicbrainz_id[MB_ID_SIZE];
 };
 typedef struct musicbrainz_recording_t musicbrainz_recording_t;