mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge pull request #2253 from elsid/fix_navmesh_tiles_cache_ub
Do not pass nullptr to std::memcmp
This commit is contained in:
commit
7bbf0b5249
@ -179,6 +179,17 @@ namespace DetourNavigator
|
|||||||
const auto lhsEnd = reinterpret_cast<const char*>(lhs.data() + lhs.size());
|
const auto lhsEnd = reinterpret_cast<const char*>(lhs.data() + lhs.size());
|
||||||
const auto lhsSize = static_cast<std::ptrdiff_t>(lhsEnd - lhsBegin);
|
const auto lhsSize = static_cast<std::ptrdiff_t>(lhsEnd - lhsBegin);
|
||||||
const auto rhsSize = static_cast<std::ptrdiff_t>(mRhsEnd - mRhsIt);
|
const auto rhsSize = static_cast<std::ptrdiff_t>(mRhsEnd - mRhsIt);
|
||||||
|
|
||||||
|
if (lhsBegin == nullptr || mRhsIt == nullptr)
|
||||||
|
{
|
||||||
|
if (lhsSize < rhsSize)
|
||||||
|
return -1;
|
||||||
|
else if (lhsSize > rhsSize)
|
||||||
|
return 1;
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
const auto size = std::min(lhsSize, rhsSize);
|
const auto size = std::min(lhsSize, rhsSize);
|
||||||
|
|
||||||
if (const auto result = std::memcmp(lhsBegin, mRhsIt, size))
|
if (const auto result = std::memcmp(lhsBegin, mRhsIt, size))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user