X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fbin-info.c;h=65f9051fb00efe087c24c1fe9f66696cf081ebd1;hp=55808eb0abb0675f5e9c809b53975597965a6252;hb=bb35f032b52330cfb17c144bfed81f2b1569f308;hpb=c862350b39e4d95750bbb627497d3768d87817ff

diff --git a/lib/bin-info.c b/lib/bin-info.c
index 55808eb0..65f9051f 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;
 }
 
@@ -1036,7 +1037,7 @@ int bin_info_child_die_has_address(struct bt_dwarf_die *die, uint64_t addr, bool
 				goto error;
 			}
 
-			if (contains) {
+			if (_contains) {
 				goto end;
 			}
 		}