From: Florian Forster <octo@collectd.org>
Date: Mon, 1 Apr 2013 14:54:45 +0000 (+0200)
Subject: nfs plugin: Copy the name before calling the non-const lookup function.
X-Git-Tag: collectd-5.1.3~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=73b6265b03bc2dcff8c5d96f909b390dffb12a01;p=collectd.git

nfs plugin: Copy the name before calling the non-const lookup function.

Fixes Github issue #70. Thanks to Jeff for reporting this issue.
---

diff --git a/src/nfs.c b/src/nfs.c
index 461e806f..1a4ed748 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/nfs.c
  * Copyright (C) 2005,2006  Jason Pepas
+ * Copyright (C) 2012,2013  Florian Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,7 +18,7 @@
  *
  * Authors:
  *   Jason Pepas <cell at ices.utexas.edu>
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Cosmin Ioiart <cioiart at gmail.com>
  **/
 
@@ -318,7 +319,7 @@ static void nfs_read_linux (FILE *fh, char *inst)
 
 #if HAVE_LIBKSTAT
 static int nfs_read_kstat (kstat_t *ksp, int nfs_version, char *inst,
-		const char **proc_names, size_t proc_names_num)
+		char const **proc_names, size_t proc_names_num)
 {
 	char plugin_instance[DATA_MAX_NAME_LEN];
 	value_t values[proc_names_num];
@@ -332,8 +333,14 @@ static int nfs_read_kstat (kstat_t *ksp, int nfs_version, char *inst,
 
 	kstat_read(kc, ksp, NULL);
 	for (i = 0; i < proc_names_num; i++)
-		values[i].counter = (derive_t) get_kstat_value (ksp,
-				(char *)proc_names[i]);
+	{
+		/* The name passed to kstat_data_lookup() doesn't have the
+		 * "const" modifier, so we need to copy the name here. */
+		char name[32];
+		sstrncpy (name, proc_names[i], sizeof (name));
+
+		values[i].counter = (derive_t) get_kstat_value (ksp, name);
+	}
 
 	nfs_procedures_submit (plugin_instance, proc_names, values,
 			proc_names_num);