intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-16 05:32:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

<rdar://problem/13925432>

Browse Source 
A user request such as: memory read -fc -s10 -c1 *charPtrPtr would cause us to crash upon trying to read 1 char of size 10 from memory
This request is now translated into: memory read -fc -s1 -c10 *charPtrPtr (i.e. read 10 chars of size 1 from memory) which is probably also what the user originally wanted

llvm-svn: 182398
This commit is contained in:
Enrico Granata
2013-05-21 17:39:04 +00:00
parent be76cd0b8e
commit 3189891857
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -827,12 +827,25 @@ protected:
DataExtractor data (data_sp,
target->GetArchitecture().GetByteOrder(),
target->GetArchitecture().GetAddressByteSize());
Format format = m_format_options.GetFormat();
if ( ( (format == eFormatChar) || (format == eFormatCharPrintable) )
&& (item_byte_size != 1)
&& (item_count == 1))
{
// this turns requests such as
// memory read -fc -s10 -c1 *charPtrPtr
// which make no sense (what is a char of size 10?)
// into a request for fetching 10 chars of size 1 from the same memory location
format = eFormatCharArray;
item_count = item_byte_size;
item_byte_size = 1;
}
assert (output_stream);
size_t bytes_dumped = data.Dump (output_stream,
0,
m_format_options.GetFormat(),
format,
item_byte_size,
item_count,
num_per_line,