X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=29aa979018b42bc9621d5b011a73daf0ae12722c;hb=b4d9bd23f3e04f9b42204d9954842524e2a7eb61;hp=c5a0cc8555c6041b1c6519888d38a24b0e8d08ea;hpb=089d33f1f455da115ca0c87160df8dbd49286377;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index c5a0cc85..29aa9790 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -213,8 +213,8 @@ static void disk_submit (const char *plugin_instance,
 	vl.values = values;
 	vl.values_len = 2;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "disk");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
@@ -454,7 +454,7 @@ static int disk_read (void)
 		major = atoll (fields[0]);
 		minor = atoll (fields[1]);
 
-		disk_name = fields[2];
+		disk_name = fields[2 + fieldshift];
 
 		for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next)
 			if (strcmp (disk_name, ds->name) == 0)