OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[lldb] Handle empty search string in "memory find" 

Given that you'd never find empty string, just error.

Also add a test that an invalid expr generates an error.

Reviewed By: JDevlieghere

Differential Revision: https://reviews.llvm.org/D123793
This commit is contained in:
David Spickett 2022-04-14 14:06:27 +00:00
parent f3ee0afc67
commit 68e73eaee6
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/source/Commands/CommandObjectMemory.cpp
View File

@ -1052,9 +1052,14 @@ protected:
DataBufferHeap buffer;
if (m_memory_options.m_string.OptionWasSet())
buffer.CopyData(m_memory_options.m_string.GetStringValue());
else if (m_memory_options.m_expr.OptionWasSet()) {
if (m_memory_options.m_string.OptionWasSet()) {
llvm::StringRef str = m_memory_options.m_string.GetStringValue();
if (str.empty()) {
result.AppendError("search string must have non-zero length.");
return false;
}
buffer.CopyData(str);
} else if (m_memory_options.m_expr.OptionWasSet()) {
StackFrame *frame = m_exe_ctx.GetFramePtr();
ValueObjectSP result_sp;
if ((eExpressionCompleted ==

11
lldb/test/API/functionalities/memory/find/TestMemoryFind.py
View File

@ -41,6 +41,11 @@ class MemoryFindTestCase(TestBase):
# Test the memory find commands.
# Empty search string should be handled.
self.expect('memory find -s "" `stringdata` `stringdata+16`',
error=True,
substrs=["error: search string must have non-zero length."])
self.expect(
'memory find -s "in const" `stringdata` `stringdata+(int)strlen(stringdata)`',
substrs=[
@ -48,6 +53,12 @@ class MemoryFindTestCase(TestBase):
'69 6e 20 63',
'in const'])
# Invalid expr is an error.
self.expect(
'memory find -e "not_a_symbol" `&bytedata[0]` `&bytedata[15]`',
error=True,
substrs=["error: expression evaluation failed. pass a string instead"])
self.expect(
'memory find -e "(uint8_t)0x22" `&bytedata[0]` `&bytedata[15]`',
substrs=[