Fixed Process::ReadScalarIntegerFromMemory()

to report proper errors when the size is not
correct.

<rdar://problem/13784456>

llvm-svn: 180888

1 files changed, 15 insertions, 3 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index f60adca741e..95abb7945b3 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -2653,10 +2653,22 @@ Process::ReadScalarIntegerFromMemory (addr_t addr,
         {
             DataExtractor data (&uval, sizeof(uval), GetByteOrder(), GetAddressByteSize());
             lldb::offset_t offset = 0;
-            if (byte_size <= 4)
-                scalar = data.GetMaxU32 (&offset, byte_size);
+            
+            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);
+            }
             else
-                scalar = data.GetMaxU64 (&offset, byte_size);
+            {
+                if (byte_size <= 4)
+                    scalar = data.GetMaxU32 (&offset, byte_size);
+                else
+                    scalar = data.GetMaxU64 (&offset, byte_size);
+            }
 
             if (is_signed)
                 scalar.SignExtend(byte_size * 8);