X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=ad069992414fb8fdb01dfa4d65ff911ed213a2e9;hb=6a68a39a2c6987fdcc94fb1bdd9cc8f598fd9478;hp=46e13b3f31256dd32e9accc1c54e2b1a47bd4426;hpb=79593ed5e0a3def8e91be5b1de15a536af2d4a92;p=collectd.git

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 46e13b3f..ad069992 100644
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -197,8 +197,10 @@ static int change_basedir (const char *orig_dir)
 	while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
 		dir[--dirlen] = '\0';
 
-	if (dirlen <= 0)
+	if (dirlen <= 0) {
+		free (dir);
 		return (-1);
+	}
 
 	status = chdir (dir);
 	if (status == 0)
@@ -300,6 +302,11 @@ static int do_init (void)
 #if HAVE_SETLOCALE
 	if (setlocale (LC_NUMERIC, COLLECTD_LOCALE) == NULL)
 		WARNING ("setlocale (\"%s\") failed.", COLLECTD_LOCALE);
+
+	/* Update the environment, so that libraries that are calling
+	 * setlocale(LC_NUMERIC, "") don't accidentally revert these changes. */
+	unsetenv ("LC_ALL");
+	setenv ("LC_NUMERIC", COLLECTD_LOCALE, /* overwrite = */ 1);
 #endif
 
 #if HAVE_LIBKSTAT