ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 03:06:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't access potentially mis-aligned, non-existent length field for non-array objects (fixes #486)

Browse Source
This commit is contained in:
Joshua Warner 2016-05-26 14:35:13 +00:00
parent 134d10960b
commit 95cd300bbd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/avian/machine.h
View File

@ -1987,11 +1987,14 @@ inline unsigned baseSize(Thread* t UNUSED, object o, GcClass* class_)
{
assertT(t, class_->fixedSize() >= BytesPerWord);
return ceilingDivide(class_->fixedSize(), BytesPerWord)
+ ceilingDivide(class_->arrayElementSize()
* fieldAtOffset<uintptr_t>(
o, class_->fixedSize() - BytesPerWord),
BytesPerWord);
unsigned size = ceilingDivide(class_->fixedSize(), BytesPerWord);
if (class_->arrayElementSize() > 0) {
size += ceilingDivide(class_->arrayElementSize()
* fieldAtOffset<uintptr_t>(
o, class_->fixedSize() - BytesPerWord),
BytesPerWord);
}
return size;
}
object makeTrace(Thread* t, Processor::StackWalker* walker);