From 8503f32b367863f4268dbe5f5dbc48b0cee6b41a Mon Sep 17 00:00:00 2001 From: trodrigues Date: Sat, 9 Dec 2023 09:37:14 -0600 Subject: [PATCH] fix typos and compilation warnings --- public/libbacktrace/dwarf.cpp | 2 +- public/libbacktrace/elf.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/public/libbacktrace/dwarf.cpp b/public/libbacktrace/dwarf.cpp index 7d8b85dd..b6d681aa 100644 --- a/public/libbacktrace/dwarf.cpp +++ b/public/libbacktrace/dwarf.cpp @@ -4275,7 +4275,7 @@ dwarf_fileline (struct backtrace_state *state, uintptr_t pc, { struct dwarf_data *ddata; int found; - int ret; + int ret = 0; if (!state->threaded) { diff --git a/public/libbacktrace/elf.cpp b/public/libbacktrace/elf.cpp index 634d4832..22a4ba20 100644 --- a/public/libbacktrace/elf.cpp +++ b/public/libbacktrace/elf.cpp @@ -7364,8 +7364,6 @@ FastVector s_sortedKnownElfRanges(16); static int address_in_known_elf_ranges(uintptr_t pc) { - size_t range_count = s_sortedKnownElfRanges.size(); - auto it = std::lower_bound( s_sortedKnownElfRanges.begin(), s_sortedKnownElfRanges.end(), pc, []( const ElfAddrRange& lhs, const uintptr_t rhs ) { return uintptr_t(lhs.dlpi_addr) > rhs; } ); if( it != s_sortedKnownElfRanges.end() && pc <= it->dlpi_end_addr ) @@ -7394,10 +7392,10 @@ phdr_callback_mock (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED, else ptr->dlpi_name = nullptr; ptr->dlpi_addr = info->dlpi_addr; - // calculate the address range so we can quickly determine is a PC is within the range of this image - ptr->dlpi_end_addr = info->dlpi_phnum ? uintptr_t( info->dlpi_addr + - info->dlpi_phdr[info->dlpi_phnum - 1].p_vaddr + - info->dlpi_phdr[info->dlpi_phnum - 1].p_memsz ) : 0x0; + // calculate the end address as well, so we can quickly determine if a PC is within the range of this image + ptr->dlpi_end_addr = uintptr_t(info->dlpi_addr) + (info->dlpi_phnum ? uintptr_t( + info->dlpi_phdr[info->dlpi_phnum - 1].p_vaddr + + info->dlpi_phdr[info->dlpi_phnum - 1].p_memsz) : 0); return 0; }