Fixed an issue where empty sections or zero filled sections could return
incorrect values and also fire an assertion.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@151066 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Symbol/ObjectFile.cpp b/source/Symbol/ObjectFile.cpp
index df7c4f8..ca039c5 100644
--- a/source/Symbol/ObjectFile.cpp
+++ b/source/Symbol/ObjectFile.cpp
@@ -393,7 +393,15 @@
}
else
{
- return CopyData (section->GetFileOffset() + section_offset, dst_len, dst);
+ const uint64_t section_file_size = section->GetFileSize();
+ if (section_offset < section_file_size)
+ {
+ const uint64_t section_bytes_left = section_file_size - section_offset;
+ uint64_t section_dst_len = dst_len;
+ if (section_dst_len > section_bytes_left)
+ section_dst_len = section_bytes_left;
+ return CopyData (section->GetFileOffset() + section_offset, section_dst_len, dst);
+ }
}
return 0;
}