From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 2 May 2016 20:27:58 +0000 (-0400)
Subject: Fix: potential close() of uninitialized elf_fd
X-Git-Tag: v1.4.0-rc1~18
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=bfadaf1262452a3f84ab5d6ea8350235b0e99a2c

Fix: potential close() of uninitialized elf_fd

elf_fd is uninitialized whenever bin is NULL.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/lib/bin-info.c b/lib/bin-info.c
index 813c6830..e5d51500 100644
--- a/lib/bin-info.c
+++ b/lib/bin-info.c
@@ -482,7 +482,7 @@ end:
 static
 int bin_info_set_elf_file(struct bin_info *bin)
 {
-	int elf_fd;
+	int elf_fd = -1;
 	Elf *elf_file = NULL;
 
 	if (!bin) {
@@ -512,7 +512,9 @@ int bin_info_set_elf_file(struct bin_info *bin)
 	return 0;
 
 error:
-	close(elf_fd);
+	if (elf_fd >= 0) {
+		close(elf_fd);
+	}
 	elf_end(elf_file);
 	return -1;
 }