X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fbin-info.c;h=e5d515005125510e0537603e05d299aac904839c;hp=023515effd510f1d118bab45f3e1f32382c279aa;hb=5f38bc819a3feece3f0c8cf1155735b090e533c1;hpb=dae52e7673333cf41828c8686158948ce93ef104

diff --git a/lib/bin-info.c b/lib/bin-info.c
index 023515ef..e5d51500 100644
--- a/lib/bin-info.c
+++ b/lib/bin-info.c
@@ -266,8 +266,7 @@ int bin_info_set_dwarf_info_build_id(struct bin_info *bin)
 
 	dbg_dir = opt_debug_info_dir ? : DEFAULT_DEBUG_DIR;
 
-	/* 2 characters per byte printed in hex, +1 for '/' and +1 for
-	 * '\0' */
+	/* 2 characters per byte printed in hex, +1 for '/' and +1 for '\0' */
 	build_id_file_len = (2 * bin->build_id_len) + 1 +
 			strlen(BUILD_ID_SUFFIX) + 1;
 	build_id_file = malloc(build_id_file_len);
@@ -483,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) {
@@ -513,12 +512,13 @@ 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;
 }
 
-
 BT_HIDDEN
 void source_location_destroy(struct source_location *src_loc)
 {
@@ -529,6 +529,7 @@ void source_location_destroy(struct source_location *src_loc)
 	free(src_loc->filename);
 	g_free(src_loc);
 }
+
 /**
  * Append a string representation of an address offset to an existing
  * string.
@@ -779,7 +780,8 @@ static
 int bin_info_lookup_cu_function_name(struct bt_dwarf_cu *cu, uint64_t addr,
 		char **func_name)
 {
-	int ret = 0, found = 0;
+	int ret = 0;
+	bool found = false;
 	struct bt_dwarf_die *die = NULL;
 
 	if (!cu || !func_name) {
@@ -884,6 +886,8 @@ int bin_info_lookup_dwarf_function_name(struct bin_info *bin, uint64_t addr,
 
 	if (_func_name) {
 		*func_name = _func_name;
+	} else {
+		goto error;
 	}
 
 	bt_dwarf_cu_destroy(cu);
@@ -980,20 +984,27 @@ error:
  * subroutines are inlined within this function and would contain
  * `addr`.
  *
+ * On success, the out parameter `contains` is set with the boolean
+ * value indicating whether the DIE's range covers `addr`. On failure,
+ * it remains unchanged.
+ *
  * Do note that this function advances the position of `die`. If the
  * address is found within one of its children, `die` will be pointing
  * to that child upon returning from the function, allowing to extract
  * the information deemed necessary.
  *
- * @param die	The parent DIE in whose children the address will be
- *		looked for
- * @param addr	The address for which to look for in the DIEs
- * @returns	Returns 1 if the address was found, 0 if not
+ * @param die		The parent DIE in whose children the address will be
+ *			looked for
+ * @param addr		The address for which to look for in the DIEs
+ * @param contains	Out parameter, true if addr is contained,
+ *			false if not
+ * @returns		Returns 0 on success, -1 on failure
  */
 static
-int bin_info_child_die_has_address(struct bt_dwarf_die *die, uint64_t addr)
+int bin_info_child_die_has_address(struct bt_dwarf_die *die, uint64_t addr, bool *contains)
 {
-	int ret = 0, contains = 0;
+	int ret = 0;
+	bool _contains = false;
 
 	if (!die) {
 		goto error;
@@ -1013,24 +1024,23 @@ int bin_info_child_die_has_address(struct bt_dwarf_die *die, uint64_t addr)
 		}
 
 		if (tag == DW_TAG_inlined_subroutine) {
-			ret = bt_dwarf_die_contains_addr(die, addr, &contains);
+			ret = bt_dwarf_die_contains_addr(die, addr, &_contains);
 			if (ret) {
 				goto error;
 			}
 
 			if (contains) {
-				ret = 1;
 				goto end;
 			}
 		}
 	} while (bt_dwarf_die_next(die) == 0);
 
 end:
-	return ret;
+	*contains = _contains;
+	return 0;
 
 error:
-	ret = 0;
-	goto end;
+	return -1;
 }
 
 /**
@@ -1048,7 +1058,8 @@ static
 int bin_info_lookup_cu_src_loc_inl(struct bt_dwarf_cu *cu, uint64_t addr,
 		struct source_location **src_loc)
 {
-	int ret = 0, found = 0;
+	int ret = 0;
+	bool found = false;
 	struct bt_dwarf_die *die = NULL;
 	struct source_location *_src_loc = NULL;
 
@@ -1070,7 +1081,7 @@ int bin_info_lookup_cu_src_loc_inl(struct bt_dwarf_cu *cu, uint64_t addr,
 		}
 
 		if (tag == DW_TAG_subprogram) {
-			int contains = 0;
+			bool contains = false;
 
 			ret = bt_dwarf_die_contains_addr(die, addr, &contains);
 			if (ret) {
@@ -1082,8 +1093,12 @@ int bin_info_lookup_cu_src_loc_inl(struct bt_dwarf_cu *cu, uint64_t addr,
 				 * Try to find an inlined subroutine
 				 * child of this DIE containing addr.
 				 */
-				found = bin_info_child_die_has_address(
-						die, addr);
+				ret = bin_info_child_die_has_address(die, addr,
+						&found);
+				if(ret) {
+					goto error;
+				}
+
 				goto end;
 			}
 		}