From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 15 May 2013 14:44:35 +0000 (+0200)
Subject: Fix resource leak on error path
X-Git-Tag: v1.1.1~10
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=9544a40b914f43d5b81956908633973366b45fc9

Fix resource leak on error path

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 10083516..d5a7040c 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -451,15 +451,20 @@ static int traverse_trace_dir(const char *fpath, const struct stat *sb,
 		/* No meta data, just return */
 		return 0;
 	} else {
+		int err_close = 0;
+
 		closeret = close(metafd);
 		if (closeret < 0) {
 			perror("close");
-			return -1;	/* failure */
+			err_close = 1;
 		}
 		closeret = close(dirfd);
 		if (closeret < 0) {
 			perror("close");
-			return -1;	/* failure */
+			err_close = 1;
+		}
+		if (err_close) {
+			return -1;
 		}
 
 		/* Add path to the global list */