Author: Slava Gurevich Date: 2022-08-16T15:30:25-07:00 New Revision: 461b410159426fdc6da77e0fb653737e04e0ebe9
URL: https://github.com/llvm/llvm-project/commit/461b410159426fdc6da77e0fb653737e04e0ebe9 DIFF: https://github.com/llvm/llvm-project/commit/461b410159426fdc6da77e0fb653737e04e0ebe9.diff LOG: [LLDB][NFC] Fix optons parsing and misc. reliability in CommandObjectThread * Improve reliability by checking return results for calls to FindLineEntryByAddress() * Fix broken option parsing in SetOptionValue() Differential Revision: https://reviews.llvm.org/D131983 Added: Modified: lldb/source/Commands/CommandObjectThread.cpp Removed: ################################################################################ diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 5d7f3c16f3894..1e317d8bfdbe8 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -62,15 +62,13 @@ class CommandObjectThreadBacktrace : public CommandObjectIterateOverThreads { const int short_option = m_getopt_table[option_idx].val; switch (short_option) { - case 'c': { - int32_t input_count = 0; - if (option_arg.getAsInteger(0, m_count)) { + case 'c': + if (option_arg.getAsInteger(0, m_count) || (m_count < 0)) { m_count = UINT32_MAX; error.SetErrorStringWithFormat( "invalid integer value for option '%c'", short_option); - } else if (input_count < 0) - m_count = UINT32_MAX; - } break; + } + break; case 's': if (option_arg.getAsInteger(0, m_start)) error.SetErrorStringWithFormat( @@ -1004,8 +1002,15 @@ class CommandObjectThreadUntil : public CommandObjectParsed { AddressRange fun_addr_range = sc.function->GetAddressRange(); Address fun_start_addr = fun_addr_range.GetBaseAddress(); - line_table->FindLineEntryByAddress(fun_start_addr, function_start, - &index_ptr); + + if (!line_table->FindLineEntryByAddress(fun_start_addr, function_start, + &index_ptr)) { + result.AppendErrorWithFormat( + "Failed to find line entry by address for " + "frame %u of thread id %" PRIu64 ".\n", + m_options.m_frame_idx, thread->GetID()); + return false; + } Address fun_end_addr(fun_start_addr.GetSection(), fun_start_addr.GetOffset() + @@ -1013,8 +1018,14 @@ class CommandObjectThreadUntil : public CommandObjectParsed { bool all_in_function = true; - line_table->FindLineEntryByAddress(fun_end_addr, function_start, - &end_ptr); + if (!line_table->FindLineEntryByAddress(fun_end_addr, function_start, + &end_ptr)) { + result.AppendErrorWithFormat( + "Failed to find line entry by address for " + "frame %u of thread id %" PRIu64 ".\n", + m_options.m_frame_idx, thread->GetID()); + return false; + } // Since not all source lines will contribute code, check if we are // setting the breakpoint on the exact line number or the nearest _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
