From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 17 May 2016 19:43:59 +0000 (-0400)
Subject: Fix: Only close valid fds in is_valid_debug_file
X-Git-Tag: v1.4.0~9
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=6ce6949a64c320786c7ca458034681b43c2c20f0

Fix: Only close valid fds in is_valid_debug_file

Fixes coverity #1354901 and #1354902

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

diff --git a/lib/bin-info.c b/lib/bin-info.c
index 55808eb0..93bca2a8 100644
--- a/lib/bin-info.c
+++ b/lib/bin-info.c
@@ -329,12 +329,12 @@ int is_valid_debug_file(char *path, uint32_t crc)
 	uint32_t _crc = 0;
 
 	if (!path) {
-		goto end;
+		goto end_noclose;
 	}
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		goto end;
+		goto end_noclose;
 	}
 
 	ret = crc32(fd, &_crc);
@@ -347,6 +347,7 @@ int is_valid_debug_file(char *path, uint32_t crc)
 
 end:
 	close(fd);
+end_noclose:
 	return ret;
 }