Return zero when we don't support the byte size. Previously is we were asked to read 3, 5, 6, or 7 byte integers, we would set the error, but still return that we read that number of bytes without populating the scalar.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@180896 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Process.cpp b/source/Target/Process.cpp
index 95abb79..8e1ab7a 100644
--- a/source/Target/Process.cpp
+++ b/source/Target/Process.cpp
@@ -2644,32 +2644,26 @@
Scalar &scalar,
Error &error)
{
- uint64_t uval;
-
- if (byte_size <= sizeof(uval))
+ uint64_t uval = 0;
+ if (byte_size == 0)
{
- size_t bytes_read = ReadMemory (addr, &uval, byte_size, error);
+ error.SetErrorString ("byte size is zero");
+ }
+ else if (byte_size & (byte_size - 1))
+ {
+ error.SetErrorStringWithFormat ("byte size %u is not a power of 2", byte_size);
+ }
+ else if (byte_size <= sizeof(uval))
+ {
+ const size_t bytes_read = ReadMemory (addr, &uval, byte_size, error);
if (bytes_read == byte_size)
{
DataExtractor data (&uval, sizeof(uval), GetByteOrder(), GetAddressByteSize());
lldb::offset_t offset = 0;
-
- if (byte_size == 0)
- {
- error.SetErrorString ("byte size is zero");
- }
- else if (byte_size & (byte_size - 1))
- {
- error.SetErrorStringWithFormat ("byte size %u is not a power of 2", byte_size);
- }
+ if (byte_size <= 4)
+ scalar = data.GetMaxU32 (&offset, byte_size);
else
- {
- if (byte_size <= 4)
- scalar = data.GetMaxU32 (&offset, byte_size);
- else
- scalar = data.GetMaxU64 (&offset, byte_size);
- }
-
+ scalar = data.GetMaxU64 (&offset, byte_size);
if (is_signed)
scalar.SignExtend(byte_size * 8);
return bytes_read;