From 73b6265b03bc2dcff8c5d96f909b390dffb12a01 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 1 Apr 2013 16:54:45 +0200 Subject: [PATCH] nfs plugin: Copy the name before calling the non-const lookup function. Fixes Github issue #70. Thanks to Jeff for reporting this issue. --- src/nfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 - * Florian octo Forster + * Florian octo Forster * Cosmin Ioiart **/ @@ -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); -- 2.11.0