X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fdebug-info%2Fbin-info.c;h=bad796d225dd7aa43921ca0e49bd3865f857b986;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=6dfbc6a439750560e396f6cd5bb9dde3827a19e5;hpb=73485cf9b02e98fa6f74946112a1d50e8e442131;p=babeltrace.git

diff --git a/plugins/lttng-utils/debug-info/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c
index 6dfbc6a4..bad796d2 100644
--- a/plugins/lttng-utils/debug-info/bin-info.c
+++ b/plugins/lttng-utils/debug-info/bin-info.c
@@ -42,7 +42,7 @@
 
 #include <glib.h>
 
-#include <babeltrace/common-internal.h>
+#include <babeltrace2/common-internal.h>
 
 #include "bin-info.h"
 #include "crc32.h"
@@ -1396,7 +1396,7 @@ int bin_info_lookup_cu_src_loc_no_inl(struct bt_dwarf_cu *cu, uint64_t addr,
 	const char *filename = NULL;
 	Dwarf_Line *line = NULL;
 	Dwarf_Addr line_addr;
-	int ret, line_no;
+	int ret = 0, line_no;
 
 	if (!cu || !src_loc) {
 		goto error;
@@ -1438,19 +1438,18 @@ int bin_info_lookup_cu_src_loc_no_inl(struct bt_dwarf_cu *cu, uint64_t addr,
 		_src_loc->filename = g_strdup(filename);
 	}
 
-	bt_dwarf_die_destroy(die);
-
 	if (_src_loc) {
 		*src_loc = _src_loc;
 	}
 
-end:
-	return 0;
+	goto end;
 
 error:
 	source_location_destroy(_src_loc);
+	ret = -1;
+end:
 	bt_dwarf_die_destroy(die);
-	return -1;
+	return ret;
 }
 
 /**