Changeset 49f1105

Timestamp:

2015-08-19T03:23:44Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3e6cdb6

Parents:

b39859e

git-author:

dequis <dx@…> (19-08-15 03:18:50)

git-committer:

dequis <dx@…> (19-08-15 03:23:44)

Message:

conf: Fix leak of members of conf_t when using -c to specify a config

Can only happen once, and it's just ~200 bytes.

But being valgrind-clean is good.

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -37 +37 @@
 
 static int conf_loadini(conf_t *conf, char *file);
+static void conf_free(conf_t *conf);
 
 conf_t *conf_load(int argc, char *argv[])
@@ -104 +105 @@
                                 g_free(global.conf_file);
                                 global.conf_file = g_strdup(optarg);
-                                g_free(conf);
+                                conf_free(conf);
                                 /* Re-evaluate arguments. Don't use this option twice,
                                    you'll end up in an infinite loop! Hope this trick
@@ -168 +169 @@
 }
 
+static void conf_free(conf_t *conf)
+{
+        /* Free software means users have the four essential freedoms:
+           0. to run the program,
+           2. to study and change the program in source code form,
+           2. to redistribute exact copies, and
+           3. to distribute modified versions
+        */
+        g_free(conf->auth_pass);
+        g_free(conf->cafile);
+        g_free(conf->configdir);
+        g_free(conf->ft_listen);
+        g_free(conf->hostname);
+        g_free(conf->iface_in);
+        g_free(conf->iface_out);
+        g_free(conf->motdfile);
+        g_free(conf->oper_pass);
+        g_free(conf->pidfile);
+        g_free(conf->plugindir);
+        g_free(conf->port);
+        g_free(conf->primary_storage);
+        g_free(conf->user);
+        g_strfreev(conf->migrate_storage);
+        g_strfreev(conf->protocols);
+        g_free(conf);
+
+}
+
 static int conf_loadini(conf_t *conf, char *file)
 {