MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when checking unknown vector types. also remove the warning when unknown vector types were not pointer-aligned

develop
Ben Lubar 2020-02-09 14:25:48 -06:00
parent 6b828115a7
commit e9dba1d6ca
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/devel/check-structures-sanity.cpp
Unescape Escape View File

@ -598,6 +598,12 @@ void Checker::check_vector(const ToCheck & item, type_identity *item_identity, b
FAIL("vector capacity (" << (capacity / ptrdiff_t(item_size)) << ") is less than its length (" << (length / ptrdiff_t(item_size)) << ")"); FAIL("vector capacity (" << (capacity / ptrdiff_t(item_size)) << ") is less than its length (" << (length / ptrdiff_t(item_size)) << ")");
} }
if (!item_identity && pointer)
{
// non-identified vector type in structures
return;
}
size_t ulength = size_t(length); size_t ulength = size_t(length);
size_t ucapacity = size_t(capacity); size_t ucapacity = size_t(capacity);
if (ulength % item_size != 0) if (ulength % item_size != 0)
@ -611,7 +617,7 @@ void Checker::check_vector(const ToCheck & item, type_identity *item_identity, b
FAIL("vector capacity is non-integer (" << (ucapacity / item_size) << " items plus " << (ucapacity % item_size) << " bytes)"); FAIL("vector capacity is non-integer (" << (ucapacity / item_size) << " items plus " << (ucapacity % item_size) << " bytes)");
} }
if (local_ok && check_access(item, reinterpret_cast<void *>(vector.start), item.identity, length)) if (local_ok && check_access(item, reinterpret_cast<void *>(vector.start), item.identity, length) && item_identity)
{ {
queue_static_array(item, reinterpret_cast<void *>(vector.start), item_identity, ulength / item_size, pointer); queue_static_array(item, reinterpret_cast<void *>(vector.start), item_identity, ulength / item_size, pointer);
} }