X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=829a645bbb18820b2ad1237574a9fe229596b6cd;hb=fab7c72365b33d30c74fa461554799ccd5f8bb60;hp=df6f6a3f496b3ad3093065fa77df79e8e7632e8e;hpb=d2b6effff5e88183f4dfc630131ab6d1b783318e;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index df6f6a3f4..829a645bb 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -238,6 +238,7 @@ int config_get_section_entries(const char *override_path, const char *section,
 	ret = ini_parse_file(config_file,
 			(ini_entry_handler) config_entry_handler_filter, (void *) &filter);
 
+	fclose(config_file);
 end:
 	return ret;
 }
@@ -2305,6 +2306,11 @@ domain_init_error:
 		}
 	}
 end:
+	if (ret < 0) {
+		ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
+		lttng_destroy_session(name);
+	}
+
 	free(kernel_domain);
 	free(ust_domain);
 	free(jul_domain);
@@ -2431,7 +2437,7 @@ int load_session_from_path(const char *path, const char *session_name,
 				continue;
 			}
 
-			if (path_len + file_name_len > PATH_MAX) {
+			if (path_len + file_name_len >= PATH_MAX) {
 				continue;
 			}