projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Multi-trace stream intersection test
[babeltrace.git]
/
lib
/
bin-info.c
diff --git
a/lib/bin-info.c
b/lib/bin-info.c
index 7048b73894ce7e6092e9cabc33fba76624610579..e5d515005125510e0537603e05d299aac904839c 100644
(file)
--- 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;
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);
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)
{
static
int bin_info_set_elf_file(struct bin_info *bin)
{
- int elf_fd;
+ int elf_fd
= -1
;
Elf *elf_file = NULL;
if (!bin) {
Elf *elf_file = NULL;
if (!bin) {
@@
-513,12
+512,13
@@
int bin_info_set_elf_file(struct bin_info *bin)
return 0;
error:
return 0;
error:
- close(elf_fd);
+ if (elf_fd >= 0) {
+ close(elf_fd);
+ }
elf_end(elf_file);
return -1;
}
elf_end(elf_file);
return -1;
}
-
BT_HIDDEN
void source_location_destroy(struct source_location *src_loc)
{
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);
}
free(src_loc->filename);
g_free(src_loc);
}
+
/**
* Append a string representation of an address offset to an existing
* string.
/**
* Append a string representation of an address offset to an existing
* string.
@@
-885,6
+886,8
@@
int bin_info_lookup_dwarf_function_name(struct bin_info *bin, uint64_t addr,
if (_func_name) {
*func_name = _func_name;
if (_func_name) {
*func_name = _func_name;
+ } else {
+ goto error;
}
bt_dwarf_cu_destroy(cu);
}
bt_dwarf_cu_destroy(cu);
This page took
0.02554 seconds
and
4
git commands to generate.