Author: Ebuka Ezike Date: 2026-07-29T12:30:37+01:00 New Revision: 29bc0749034c4f2bda0752360ecacd4e89d7439c
URL: https://github.com/llvm/llvm-project/commit/29bc0749034c4f2bda0752360ecacd4e89d7439c DIFF: https://github.com/llvm/llvm-project/commit/29bc0749034c4f2bda0752360ecacd4e89d7439c.diff LOG: [lldb] Fix crash on creating string error (#212503) It crashes because the `default` error string may not be a format string compared to the `fallback` error string Added: Modified: lldb/source/API/SBTarget.cpp lldb/source/Target/Target.cpp Removed: ################################################################################ diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp index cf2b1dc611df3..9eca813d8584b 100644 --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -2159,6 +2159,8 @@ lldb::SBInstructionList SBTarget::ReadInstructions(lldb::SBAddress base_addr, if (llvm::Expected<DisassemblerSP> disassembler = target_sp->ReadInstructions(*addr_ptr, count, flavor_string)) { sb_instructions.SetDisassembler(*disassembler); + } else { + LLDB_LOG_ERROR(GetLog(LLDBLog::API), disassembler.takeError(), "{0}"); } } } diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 148d7e0b30dbb..239c82e02348d 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -3119,11 +3119,13 @@ Target::ReadInstructions(const Address &start_addr, uint32_t count, ReadMemory(start_addr, data.GetBytes(), data.GetByteSize(), error, force_live_memory, &load_addr); - if (error.Fail()) - return llvm::createStringErrorV( - error.AsCString( - "Target::ReadInstructions failed to read memory at {:x}"), - start_addr.GetLoadAddress(this)); + if (error.Fail()) { + return llvm::joinErrors( + llvm::createStringErrorV( + "Target::ReadInstructions failed to read memory at {:x}: ", + start_addr.GetLoadAddress(this)), + error.takeError()); + } const bool data_from_file = load_addr == LLDB_INVALID_ADDRESS; if (!flavor_string || flavor_string[0] == '\0') { _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
