X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fautodisc%2Fautodisc.c;h=0ae53817866924f16e74b0da9b471ccb715f1c01;hp=1a4f07dc39d537011f01428cb1d120d34dd02208;hb=d2b44fef4f0e01f43783115f7c2e97e32c970a52;hpb=5ce9818ba4e76858b2ef12c81ba75c1306f195d3

diff --git a/src/autodisc/autodisc.c b/src/autodisc/autodisc.c
index 1a4f07dc..0ae53817 100644
--- a/src/autodisc/autodisc.c
+++ b/src/autodisc/autodisc.c
@@ -579,6 +579,7 @@ auto_source_discovery_internal_status auto_discover_source_for_input_as_dir_or_f
 {
 	auto_source_discovery_internal_status status;
 	GError *error = NULL;
+	GDir *dir = NULL;
 
 	if (g_file_test(input->str, G_FILE_TEST_IS_REGULAR)) {
 		/* It's a file. */
@@ -587,7 +588,6 @@ auto_source_discovery_internal_status auto_discover_source_for_input_as_dir_or_f
 			component_class_restrict, log_level, auto_disc,
 			interrupter);
 	} else if (g_file_test(input->str, G_FILE_TEST_IS_DIR)) {
-		GDir *dir;
 		const gchar *dirent;
 		gsize saved_input_len;
 		int dir_status = AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_NO_MATCH;
@@ -658,8 +658,6 @@ auto_source_discovery_internal_status auto_discover_source_for_input_as_dir_or_f
 		} while (dirent);
 
 		status = dir_status;
-
-		g_dir_close(dir);
 	} else {
 		BT_LOGD("Skipping %s, not a file or directory", input->str);
 		status = AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_NO_MATCH;
@@ -671,6 +669,9 @@ error:
 	status = AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_ERROR;
 
 end:
+	if (dir) {
+		g_dir_close(dir);
+	}
 
 	if (error) {
 		g_error_free(error);