diff options
| -rw-r--r-- | lldb/source/Commands/CommandObjectWatchpoint.cpp | 21 | ||||
| -rw-r--r-- | lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index 150d712316b..ce6b71e76f5 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -1129,11 +1129,11 @@ CommandObjectWatchpointSetExpression::ExecuteRawCommandString return false; } - bool no_dash_w = !m_option_watchpoint.watch_type_specified; - bool no_dash_x = (m_option_watchpoint.watch_size == 0); + bool with_dash_w = m_option_watchpoint.watch_type_specified; + bool with_dash_x = (m_option_watchpoint.watch_size != 0); // If no '-w' is specified, default to '-w read_write'. - if (no_dash_w) + if (!with_dash_w) { m_option_watchpoint.watch_type = OptionGroupWatchpoint::eWatchReadWrite; } @@ -1149,7 +1149,15 @@ CommandObjectWatchpointSetExpression::ExecuteRawCommandString // We will process the raw command string to rid of the '-w', '-x', or '--' llvm::StringRef raw_expr_str(raw_command); - std::string expr_str = StripOptionTerminator(raw_expr_str, !no_dash_w, !no_dash_x).str(); + std::string expr_str = StripOptionTerminator(raw_expr_str, with_dash_w, with_dash_x).str(); + + // Sanity check for when the user forgets to terminate the option strings with a '--'. + if ((with_dash_w || with_dash_w) && expr_str.empty()) + { + result.GetErrorStream().Printf("error: did you forget to enter the option terminator string \"--\"?\n"); + result.SetStatus(eReturnStatusFailed); + return false; + } // Use expression evaluation to arrive at the address to watch. const bool coerce_to_id = true; @@ -1167,6 +1175,7 @@ CommandObjectWatchpointSetExpression::ExecuteRawCommandString result.GetErrorStream().Printf("error: expression evaluation of address to watch failed\n"); result.GetErrorStream().Printf("expression evaluated: %s\n", expr_str.c_str()); result.SetStatus(eReturnStatusFailed); + return false; } // Get the address to watch. @@ -1176,8 +1185,8 @@ CommandObjectWatchpointSetExpression::ExecuteRawCommandString result.SetStatus(eReturnStatusFailed); return false; } - size = no_dash_x ? target->GetArchitecture().GetAddressByteSize() - : m_option_watchpoint.watch_size; + size = with_dash_x ? m_option_watchpoint.watch_size + : target->GetArchitecture().GetAddressByteSize(); // Now it's time to create the watchpoint. uint32_t watch_type = m_option_watchpoint.watch_type; diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py index 5a390443c26..44d1664f7bd 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py @@ -61,6 +61,10 @@ class WatchpointSetErrorTestCase(TestBase): self.expect("watchpoint set expression -w write --", error=True, startstr = 'error: required argument missing; specify an expression to evaulate into the addres to watch for') + # Check for missing option terminator '--'. + self.expect("watchpoint set expression -w write -x 1 g_char_ptr", error=True, + startstr = 'error: did you forget to enter the option terminator string "--"?') + # Wrong size parameter is an error. self.expect("watchpoint set variable -x -128", error=True, substrs = ['invalid enumeration value']) |
