Enhance: systemic disposal of struct booth config

Signed-off-by: Jan Pokorný <[email protected]>

Author: jnpkrn

src/config.c

@@ -537,7 +537,7 @@ int read_config(struct booth_config **conf_pptr,
 	struct ticket_config *current_tk = NULL;
 
 	assert(conf_pptr != NULL);
-	free(*conf_pptr);
+	config_free(*conf_pptr);
 
 	fp = fopen(path, "r");
 	if (!fp) {
@@ -901,11 +901,19 @@ int read_config(struct booth_config **conf_pptr,
 	log_error("%s in config file line %d",
 			error, lineno);
 
-	free(*conf_pptr);
+	config_free(*conf_pptr);
 	*conf_pptr = NULL;
 	return -1;
 }
 
+void config_free(struct booth_config *conf_ptr)
+{
+	if (conf_ptr != NULL) {
+		free(conf_ptr->ticket);
+	}
+	free(conf_ptr);
+}
+
 int check_config(struct booth_config *conf_ptr, int type)
 {
 	struct passwd *pw;

src/config.h

@@ -346,12 +346,22 @@ struct booth_config {
  * @param[in] type role currently being acted as
  *
  * @return 0 or negative value (-1 or -errno) on error
+ *
+ * @note To eventually dispose the associated memory, use #config_free.
  */
 int read_config(struct booth_config **conf_pptr,
                 const booth_transport_table_t *transport,
                 const struct ticket_handler *ticket_handler,
                 const char *path, int type);
 
+/**
+ * @internal
+ * Memory disposal for the config object
+ *
+ * @param[inout] conf_ptr config object to free
+ */
+void config_free(struct booth_config *conf_ptr);
+
 /**
  * @internal
  * Check booth configuration

src/main.c

@@ -1640,6 +1640,8 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 out:
+	config_free(booth_conf);
+
 #ifdef LOGGING_LIBQB
 	qb_log_fini();
 #endif